kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

possible fix for warnings

This commit is contained in:
Ken Martin 2002-09-29 14:09:38 -04:00
parent 595c15c84a
commit dbd13144a3
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmWin32ProcessExecution.cxx
View File

@ -88,7 +88,7 @@ static BOOL RealPopenCreateProcess(const char *cmdstring,
_stricmp(comshell, "command.com") != 0) _stricmp(comshell, "command.com") != 0)
{ {
/* NT/2000 and not using command.com. */ /* NT/2000 and not using command.com. */
x = i + strlen(s3) + strlen(cmdstring) + 1; x = i + (int)strlen(s3) + (int)strlen(cmdstring) + 1;
s2 = (char *)_alloca(x); s2 = (char *)_alloca(x);
ZeroMemory(s2, x); ZeroMemory(s2, x);
sprintf(s2, "%s%s%s", s1, s3, cmdstring); sprintf(s2, "%s%s%s", s1, s3, cmdstring);
@ -143,9 +143,9 @@ static BOOL RealPopenCreateProcess(const char *cmdstring,
return FALSE; return FALSE;
} }
} }
x = i + strlen(s3) + strlen(cmdstring) + 1 + x = i + (int)strlen(s3) + (int)strlen(cmdstring) + 1 +
strlen(modulepath) + (int)strlen(modulepath) +
strlen(szConsoleSpawn) + 1; (int)strlen(szConsoleSpawn) + 1;
s2 = (char *)_alloca(x); s2 = (char *)_alloca(x);
ZeroMemory(s2, x); ZeroMemory(s2, x);
@ -272,7 +272,7 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
{ {
case _O_WRONLY | _O_TEXT: case _O_WRONLY | _O_TEXT:
/* Case for writing to child Stdin in text mode. */ /* Case for writing to child Stdin in text mode. */
fd1 = _open_osfhandle((long)hChildStdinWrDup, mode); fd1 = _open_osfhandle((intptr_t)hChildStdinWrDup, mode);
f1 = _fdopen(fd1, "w"); f1 = _fdopen(fd1, "w");
/* We don't care about these pipes anymore, /* We don't care about these pipes anymore,
so close them. */ so close them. */
@ -282,7 +282,7 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
case _O_RDONLY | _O_TEXT: case _O_RDONLY | _O_TEXT:
/* Case for reading from child Stdout in text mode. */ /* Case for reading from child Stdout in text mode. */
fd1 = _open_osfhandle((long)hChildStdoutRdDup, mode); fd1 = _open_osfhandle((intptr_t)hChildStdoutRdDup, mode);
f1 = _fdopen(fd1, "r"); f1 = _fdopen(fd1, "r");
/* We don't care about these pipes anymore, /* We don't care about these pipes anymore,
so close them. */ so close them. */
@ -293,7 +293,7 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
case _O_RDONLY | _O_BINARY: case _O_RDONLY | _O_BINARY:
/* Case for readinig from child Stdout in /* Case for readinig from child Stdout in
binary mode. */ binary mode. */
fd1 = _open_osfhandle((long)hChildStdoutRdDup, mode); fd1 = _open_osfhandle((intptr_t)hChildStdoutRdDup, mode);
f1 = _fdopen(fd1, "rb"); f1 = _fdopen(fd1, "rb");
/* We don't care about these pipes anymore, /* We don't care about these pipes anymore,
so close them. */ so close them. */
@ -303,7 +303,7 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
case _O_WRONLY | _O_BINARY: case _O_WRONLY | _O_BINARY:
/* Case for writing to child Stdin in binary mode. */ /* Case for writing to child Stdin in binary mode. */
fd1 = _open_osfhandle((long)hChildStdinWrDup, mode); fd1 = _open_osfhandle((intptr_t)hChildStdinWrDup, mode);
f1 = _fdopen(fd1, "wb"); f1 = _fdopen(fd1, "wb");
/* We don't care about these pipes anymore, /* We don't care about these pipes anymore,
so close them. */ so close them. */
@ -331,9 +331,9 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
m2 = "wb"; m2 = "wb";
} }
fd1 = _open_osfhandle((long)hChildStdinWrDup, mode); fd1 = _open_osfhandle((intptr_t)hChildStdinWrDup, mode);
f1 = _fdopen(fd1, m2); f1 = _fdopen(fd1, m2);
fd2 = _open_osfhandle((long)hChildStdoutRdDup, mode); fd2 = _open_osfhandle((intptr_t)hChildStdoutRdDup, mode);
f2 = _fdopen(fd2, m1); f2 = _fdopen(fd2, m1);
if (n != 4) if (n != 4)
@ -359,11 +359,11 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
m2 = "wb"; m2 = "wb";
} }
fd1 = _open_osfhandle((long)hChildStdinWrDup, mode); fd1 = _open_osfhandle((intptr_t)hChildStdinWrDup, mode);
f1 = _fdopen(fd1, m2); f1 = _fdopen(fd1, m2);
fd2 = _open_osfhandle((long)hChildStdoutRdDup, mode); fd2 = _open_osfhandle((intptr_t)hChildStdoutRdDup, mode);
f2 = _fdopen(fd2, m1); f2 = _fdopen(fd2, m1);
fd3 = _open_osfhandle((long)hChildStderrRdDup, mode); fd3 = _open_osfhandle((intptr_t)hChildStderrRdDup, mode);
f3 = _fdopen(fd3, m1); f3 = _fdopen(fd3, m1);
file_count = 3; file_count = 3;

1
Source/cmWin32ProcessExecution.h
View File

@ -27,6 +27,7 @@
#include "cmStandardIncludes.h" #include "cmStandardIncludes.h"
#include "windows.h" #include "windows.h"
#include "stdio.h"
class cmMakefile; class cmMakefile;