diff options
| -rw-r--r-- | solenv/bin/concat-deps.c | 5 | ||||
| -rw-r--r-- | solenv/gcc-wrappers/wrapper.cxx | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 064492ae8c5d..cfaac07e6691 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -28,7 +28,6 @@ #endif /* Def _AIX */ #ifdef _MSC_VER -#define __windows #undef CORE_BIG_ENDIAN #define CORE_LITTLE_ENDIAN #endif /* Def _MSC_VER */ @@ -80,7 +79,7 @@ #include <string.h> #include <ctype.h> -#ifdef __windows +#ifdef _MSC_VER #include <io.h> #else #include <unistd.h> @@ -89,7 +88,7 @@ #include <config_options.h> /* modes */ -#ifdef __windows +#ifdef _MSC_VER #define FILE_O_RDONLY _O_RDONLY #define FILE_O_BINARY _O_BINARY #define PATHNCMP _strnicmp /* MSVC converts paths to lower-case sometimes? */ diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx index cc57698a3aa9..cc312722f201 100644 --- a/solenv/gcc-wrappers/wrapper.cxx +++ b/solenv/gcc-wrappers/wrapper.cxx @@ -129,7 +129,7 @@ string processccargs(vector<string> rawargs) { } else if(!(*i).compare(0,2,"-D")) { // need to re-escape strings for preprocessor - for(size_t pos=(*i).find("\"",0); pos!=string::npos; pos=(*i).find("\"",pos)) { + for(size_t pos=(*i).find("\""); pos!=string::npos; pos=(*i).find("\"",pos)) { (*i).replace(pos,0,"\\"); pos+=2; } @@ -202,12 +202,12 @@ int startprocess(string command, string args) { if(!CreateProcess(nullptr, // Process Name cmdlineBuf, // Command Line - NULL, // Process Handle not Inheritable - NULL, // Thread Handle not Inheritable + nullptr, // Process Handle not Inheritable + nullptr, // Thread Handle not Inheritable TRUE, // Handles are Inherited 0, // No creation flags - NULL, // Environment for process - NULL, // Use same starting directory + nullptr, // Environment for process + nullptr, // Use same starting directory &si, // Startup Info &pi) // Process Information ) { @@ -223,7 +223,7 @@ int startprocess(string command, string args) { DWORD readlen, writelen, ret; HANDLE stdout_handle=GetStdHandle(STD_OUTPUT_HANDLE); while(true) { - int success=ReadFile(childout_read,buffer,BUFLEN,&readlen,NULL); + int success=ReadFile(childout_read,buffer,BUFLEN,&readlen,nullptr); // check if the child process has exited if(GetLastError()==ERROR_BROKEN_PIPE) break; @@ -232,7 +232,7 @@ int startprocess(string command, string args) { exit(1); } if(readlen!=0) { - WriteFile(stdout_handle,buffer,readlen,&writelen,NULL); + WriteFile(stdout_handle,buffer,readlen,&writelen,nullptr); } } WaitForSingleObject(pi.hProcess, INFINITE); |