[Cmake-commits] [cmake-commits] king committed SystemTools.cxx 1.250 1.251

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv7838/Source/kwsys

Modified Files:
	SystemTools.cxx 
Log Message:
Fix KWSys SystemTools build on cygwin with -mwin32

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.


Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.250
retrieving revision 1.251
diff -C 2 -d -r1.250 -r1.251
*** SystemTools.cxx	22 Sep 2009 18:56:33 -0000	1.250
--- SystemTools.cxx	23 Sep 2009 14:45:00 -0000	1.251
***************
*** 71,75 ****
  
  #ifdef __CYGWIN__
- # undef _WIN32
  extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path);
  #endif
--- 71,74 ----
***************
*** 2615,2619 ****
    if(stat(name, &fs) == 0)
      {
! #if defined( _WIN32 )
      return ((fs.st_mode & _S_IFDIR) != 0);
  #else
--- 2614,2618 ----
    if(stat(name, &fs) == 0)
      {
! #if defined( _WIN32 ) && !defined(__CYGWIN__)
      return ((fs.st_mode & _S_IFDIR) != 0);
  #else