mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
Add .cvsignore, and fix a compiler warning
This commit is contained in:
parent
014cbea237
commit
7719548051
12
ppremake/.gitignore
vendored
Normal file
12
ppremake/.gitignore
vendored
Normal 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
|
@ -1666,8 +1666,8 @@ expand_shell(const string ¶ms) {
|
||||
close(pd[0]);
|
||||
dup2(pd[1], STDOUT_FILENO);
|
||||
char *argv[4];
|
||||
argv[0] = "sh";
|
||||
argv[1] = "-c";
|
||||
argv[0] = (char *)"sh";
|
||||
argv[1] = (char *)"-c";
|
||||
argv[2] = (char *)command.c_str();
|
||||
argv[3] = (char *)NULL;
|
||||
execv("/bin/sh", argv);
|
||||
@ -1772,7 +1772,7 @@ expand_length(const string ¶ms) {
|
||||
string word = trim_blanks(expand_string(params));
|
||||
|
||||
char buffer[32];
|
||||
sprintf(buffer, "%d", word.length());
|
||||
sprintf(buffer, "%d", (int) word.length());
|
||||
string result = buffer;
|
||||
return result;
|
||||
}
|
||||
@ -2104,7 +2104,7 @@ expand_words(const string ¶ms) {
|
||||
tokenize_whitespace(expand_string(params), words);
|
||||
|
||||
char buffer[32];
|
||||
sprintf(buffer, "%d", words.size());
|
||||
sprintf(buffer, "%d", (int) words.size());
|
||||
string result = buffer;
|
||||
return result;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user