COMP: Simplified include file logic. The windows.h header should be included for all compilers on windows.

This commit is contained in:
Brad King 2007-10-07 16:22:16 -04:00
parent bdc1de21d1
commit 71400cad02

View File

@ -18,35 +18,26 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <string.h>
#include <cmsys/RegularExpression.hxx> #include <cmsys/RegularExpression.hxx>
#include <cmsys/Directory.hxx> #include <cmsys/Directory.hxx>
#include <cmsys/System.h> #include <cmsys/System.h>
// support for realpath call #if defined(_WIN32)
#ifndef _WIN32 # include <windows.h>
#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
#else #else
#include <sys/types.h> # include <sys/types.h>
#include <fcntl.h> # include <unistd.h>
#include <unistd.h> # include <utime.h>
#include <utime.h>
#endif #endif
#include <sys/stat.h> #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) #if defined(CMAKE_BUILD_WITH_CMAKE)
# include <libtar/libtar.h> # include <libtar/libtar.h>
# include <memory> // auto_ptr # include <memory> // auto_ptr
@ -68,7 +59,7 @@ extern char** environ;
# endif # endif
#endif #endif
#ifdef CM_SYSTEM_TOOLS_WINDOWS #ifdef _WIN32
class cmSystemToolsWindowsHandle class cmSystemToolsWindowsHandle
{ {
public: public: