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

Fix KWSys SystemTools build on cygwin with -mwin32

Browse Source 
Commit "Optimize KWSys SystemTools::FileExists on Windows" accidentally
added "#undef _WIN32" when including <windows.h> on cygwin, which breaks
builds using the -mwin32 flag.  This commit removes that line and fixes
the real error it was intended to avoid.
This commit is contained in:
Brad King 2009-09-23 10:45:00 -04:00
parent 6f45c1d88c
commit 4e121af95e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/kwsys/SystemTools.cxx
View File

@ -70,7 +70,6 @@
#endif #endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__
# undef _WIN32
extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path); extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path);
#endif #endif
@ -2614,7 +2613,7 @@ bool SystemTools::FileIsDirectory(const char* name)
struct stat fs; struct stat fs;
if(stat(name, &fs) == 0) if(stat(name, &fs) == 0)
{ {
#if defined( _WIN32 ) #if defined( _WIN32 ) && !defined(__CYGWIN__)
return ((fs.st_mode & _S_IFDIR) != 0); return ((fs.st_mode & _S_IFDIR) != 0);
#else #else
return S_ISDIR(fs.st_mode); return S_ISDIR(fs.st_mode);