diff options
| -rw-r--r-- | Source/cmStandardIncludes.h | 1 | ||||
| -rw-r--r-- | Source/cmSystemTools.cxx | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 4664f46..1b13cbd 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -54,6 +54,7 @@ #ifdef CMAKE_NO_STD_NAMESPACE #define std +# define for if (false) { } else for #endif diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 957ee46..0087ca0 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -43,9 +43,9 @@ bool cmSystemTools::s_ErrorOccured = false; void cmSystemTools::GetPath(std::vector<std::string>& path) { #if defined(_WIN32) && !defined(__CYGWIN__) - char* pathSep = ";"; + const char* pathSep = ";"; #else - char* pathSep = ":"; + const char* pathSep = ":"; #endif std::string pathEnv = getenv("PATH"); std::string::size_type start =0; |