diff options
| author | Brad King <brad.king@kitware.com> | 2007-10-07 20:22:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-10-07 20:22:16 (GMT) |
| commit | 71400cad0253c8f62623b8e9451342f58a973315 (patch) | |
| tree | 5447a7a508471ecd4f615fd87a52d2fceed11c39 | |
| parent | bdc1de21d1335c7ac9d0fe0416b9eed135a88fa2 (diff) | |
| download | CMake-71400cad0253c8f62623b8e9451342f58a973315.zip CMake-71400cad0253c8f62623b8e9451342f58a973315.tar.gz CMake-71400cad0253c8f62623b8e9451342f58a973315.tar.bz2 | |
COMP: Simplified include file logic. The windows.h header should be included for all compilers on windows.
| -rw-r--r-- | Source/cmSystemTools.cxx | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index fd09409..ac82c53 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -18,35 +18,26 @@ #include <ctype.h> #include <errno.h> #include <time.h> +#include <string.h> #include <cmsys/RegularExpression.hxx> #include <cmsys/Directory.hxx> #include <cmsys/System.h> -// support for realpath call -#ifndef _WIN32 -#include <limits.h> -#include <stdlib.h> -#include <sys/param.h> -#include <sys/wait.h> -#endif - -#if defined(_WIN32) && (defined(_MSC_VER) || defined(__BORLANDC__)) -# define CM_SYSTEM_TOOLS_WINDOWS -#include <string.h> -#include <windows.h> -#include <direct.h> -#include <io.h> -#define _unlink unlink +#if defined(_WIN32) +# include <windows.h> #else -#include <sys/types.h> -#include <fcntl.h> -#include <unistd.h> -#include <utime.h> +# include <sys/types.h> +# include <unistd.h> +# include <utime.h> #endif #include <sys/stat.h> +#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__)) +# include <io.h> +#endif + #if defined(CMAKE_BUILD_WITH_CMAKE) # include <libtar/libtar.h> # include <memory> // auto_ptr @@ -68,7 +59,7 @@ extern char** environ; # endif #endif -#ifdef CM_SYSTEM_TOOLS_WINDOWS +#ifdef _WIN32 class cmSystemToolsWindowsHandle { public: |