(Try to) fix troubles with WIN32 vs _WIN32 at compile time

diff --git a/Example/Volume2Dicom.cxx b/Example/Volume2Dicom.cxx
index 8ab620852e5f82f5603f2a90e3bfc24472ce5ac5..4ed808b7ce3cb5e295e92951b617951370644a17 100644 (file)
--- a/Example/Volume2Dicom.cxx
+++ b/Example/Volume2Dicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: Volume2Dicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/05/23 14:18:04 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2007/05/30 11:05:47 $
+  Version:   $Revision: 1.13 $
                                                                                  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,7 +33,7 @@
 #include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef WIN32
+#ifdef _WIN32
    #define stat _stat
 #endif
 

diff --git a/src/gdcmopenjpeg/codec/CMakeLists.txt b/src/gdcmopenjpeg/codec/CMakeLists.txt
index 3f3c7d5a3f5a3521dab16c111d6700e2008abc70..00de4f365ee31426f368766a239b2eeb928999fc 100644 (file)
--- a/src/gdcmopenjpeg/codec/CMakeLists.txt
+++ b/src/gdcmopenjpeg/codec/CMakeLists.txt
@@ -37,7 +37,8 @@ IF(NOT BUILD_SHARED_LIBS)
 ENDIF(NOT BUILD_SHARED_LIBS)
 
 # Loop over all executables:
-FOREACH(exe j2k_to_image image_to_j2k)
+#FOREACH(exe j2k_to_image image_to_j2k)
+FOREACH(exe  image_to_j2k)
   ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
   TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg)
   # On unix you need to link to the math library:

diff --git a/src/gdcmopenjpeg/codec/image_to_j2k.c b/src/gdcmopenjpeg/codec/image_to_j2k.c
index 812008695c10791cd900d053c9fdc0388167d8ac..427a5efd37a145f89d7582b830eccb3f35ea7f59 100644 (file)
--- a/src/gdcmopenjpeg/codec/image_to_j2k.c
+++ b/src/gdcmopenjpeg/codec/image_to_j2k.c
@@ -35,7 +35,7 @@
 #include "compat/getopt.h"
 #include "convert.h"
 
-#ifndef WIN32
+#ifndef _WIN32
 #define stricmp strcasecmp
 #define strnicmp strncasecmp
 #endif

diff --git a/src/gdcmopenjpeg/libopenjpeg/j2k_lib.c b/src/gdcmopenjpeg/libopenjpeg/j2k_lib.c
index 230be80c28b9a3e7609c3628b2a691ad0ec40e6c..3a6fae1294ab05a880d536528d94fffa26bc2432 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/j2k_lib.c
+++ b/src/gdcmopenjpeg/libopenjpeg/j2k_lib.c
@@ -24,17 +24,17 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #else
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/times.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 #include "opj_includes.h"
 
 double opj_clock() {
-#ifdef WIN32
+#ifdef _WIN32
   /* WIN32: use QueryPerformance (very accurate) */
     LARGE_INTEGER freq , t ;
     /* freq is the clock speed of the CPU */

diff --git a/src/gdcmopenjpeg/libopenjpeg/openjpeg.c b/src/gdcmopenjpeg/libopenjpeg/openjpeg.c
index 6097cdbafdbb708a2b8441799325b44eed9dccc0..31429119fc8960ad04d0681eaba1e246b6f28818 100644 (file)
--- a/src/gdcmopenjpeg/libopenjpeg/openjpeg.c
+++ b/src/gdcmopenjpeg/libopenjpeg/openjpeg.c
@@ -24,14 +24,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 #include "opj_includes.h"
 
 /* ---------------------------------------------------------------------- */
-#ifdef WIN32
+#ifdef _WIN32
 #ifndef OPJ_STATIC
 BOOL APIENTRY
 DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {