TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add .cvsignore, and fix a compiler warning

Browse Source
This commit is contained in:
rdb 2009-06-16 09:36:29 +00:00
parent 014cbea237
commit 7719548051
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ppremake/.gitignore vendored Normal file
View File

@ -0,0 +1,12 @@
/.deps/
/Makefile.in
/aclocal.m4
/autom4te.cache/
/config.h
/config.h.in
/config.log
/config.status
/configure
/ppremake
/stamp-h1
Makefile

8
ppremake/ppScope.cxx
View File

@ -1666,8 +1666,8 @@ expand_shell(const string &params) {
close(pd[0]); close(pd[0]);
dup2(pd[1], STDOUT_FILENO); dup2(pd[1], STDOUT_FILENO);
char *argv[4]; char *argv[4];
argv[0] = "sh"; argv[0] = (char *)"sh";
argv[1] = "-c"; argv[1] = (char *)"-c";
argv[2] = (char *)command.c_str(); argv[2] = (char *)command.c_str();
argv[3] = (char *)NULL; argv[3] = (char *)NULL;
execv("/bin/sh", argv); execv("/bin/sh", argv);
@ -1772,7 +1772,7 @@ expand_length(const string &params) {
string word = trim_blanks(expand_string(params)); string word = trim_blanks(expand_string(params));
char buffer[32]; char buffer[32];
sprintf(buffer, "%d", word.length()); sprintf(buffer, "%d", (int) word.length());
string result = buffer; string result = buffer;
return result; return result;
} }
@ -2104,7 +2104,7 @@ expand_words(const string &params) {
tokenize_whitespace(expand_string(params), words); tokenize_whitespace(expand_string(params), words);
char buffer[32]; char buffer[32];
sprintf(buffer, "%d", words.size()); sprintf(buffer, "%d", (int) words.size());
string result = buffer; string result = buffer;
return result; return result;
} }