From d3a15a09b05b0a483066a39a2688833d48acb5c1 Mon Sep 17 00:00:00 2001 From: Andreas Gravgaard Andersen Date: Fri, 21 Apr 2017 16:59:27 -0400 Subject: [PATCH] WIN32 is not necessarily defined _WIN32 should be Typo or intentional? _WIN32 is described in https://msdn.microsoft.com/en-us/library/b0084kay(v=vs.140).aspx for all editions WIN32 is not defined for any. Thus the reason to not change this would be to somehow take into account windows c++ compilers that does not define this flag by default. However, on my combination of cmake flags WIN32 were not defined at compile-time. (On Windows 8.1 with Visual studio v140, v120 and the Intel C++ Compiler 17.0 - Using ExternalProject_Add almost the same way Slicer do, but without the VTK dependency) --- .../src/gdcm/Utilities/gdcmopenjpeg-v2/libopenjpeg/opj_malloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg-v2/libopenjpeg/opj_malloc.h b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg-v2/libopenjpeg/opj_malloc.h index ebb3c85dfc7..624459ba3b3 100644 --- a/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg-v2/libopenjpeg/opj_malloc.h +++ b/Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg-v2/libopenjpeg/opj_malloc.h @@ -64,7 +64,7 @@ Allocate memory aligned to a 16 byte boundry @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available */ /* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */ -#ifdef WIN32 +#ifdef _WIN32 /* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */ #ifdef __GNUC__ #include