diff options
author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2006-12-09 16:25:25 (GMT) |
---|---|---|
committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2006-12-09 16:25:25 (GMT) |
commit | b9787a965f8d414b0d505ba48d10c0d4a5082d69 (patch) | |
tree | 14ecef09aa1bd3e8ceb2879fa09f3e78e10d4cca /Source/kwsys/DynamicLoader.cxx | |
parent | 945dfe5c8e020e73be6d36349ec29d0404b27c25 (diff) | |
download | CMake-b9787a965f8d414b0d505ba48d10c0d4a5082d69.zip CMake-b9787a965f8d414b0d505ba48d10c0d4a5082d69.tar.gz CMake-b9787a965f8d414b0d505ba48d10c0d4a5082d69.tar.bz2 |
BUG: revert yesterday patch. The implementation was correct. The problem was that _WIN32 was forced to be #define on cygwin when included from ITK, which was miss matching the implementation from the declaration. Put extra condition for CYGWIN system
Diffstat (limited to 'Source/kwsys/DynamicLoader.cxx')
-rw-r--r-- | Source/kwsys/DynamicLoader.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/DynamicLoader.cxx b/Source/kwsys/DynamicLoader.cxx index 4b73322..f4aa064 100644 --- a/Source/kwsys/DynamicLoader.cxx +++ b/Source/kwsys/DynamicLoader.cxx @@ -219,8 +219,8 @@ const char* DynamicLoader::LastError() #endif // __APPLE__ // --------------------------------------------------------------- -// 3. Implementation for Windows win32 code -#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) +// 3. Implementation for Windows win32 code but not cygwin +#if defined(_WIN32) && !defined(__CYGWIN__) #include <windows.h> #define DYNAMICLOADER_DEFINED 1 |