diff options
| author | Antonin Descampe <antonin@gmail.com> | 2010-11-25 11:58:26 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2010-11-25 11:58:26 +0000 |
| commit | 389166e86e14a3a09ccf3d28ca0ee64968c5de45 (patch) | |
| tree | 484795d3ca90f83d4ba6eb7001098ac4622f0b7a /libopenjpeg/opj_malloc.h | |
| parent | 2b31495723e04ef79395c718b422d6fa6e6e1979 (diff) | |
fix compilation and DLL creation of libopenjpeg with MSYS/MinGW (from vincent.torri, see issue 47 on googlecode)
Diffstat (limited to 'libopenjpeg/opj_malloc.h')
| -rw-r--r-- | libopenjpeg/opj_malloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopenjpeg/opj_malloc.h b/libopenjpeg/opj_malloc.h index 1c99bcd5..64908f3e 100644 --- a/libopenjpeg/opj_malloc.h +++ b/libopenjpeg/opj_malloc.h @@ -69,7 +69,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 <mm_malloc.h>
@@ -80,7 +80,7 @@ Allocate memory aligned to a 16 byte boundry #define HAVE_MM_MALLOC
#endif
#endif
-#else /* Not WIN32 */
+#else /* Not _WIN32 */
#if defined(__sun)
#define HAVE_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */
|