rename j2k_setup_decoder_v2 to opj_j2k_setup_decoder

[openjpeg.git] / libopenjpeg / opj_malloc.h

diff --git a/libopenjpeg/opj_malloc.h b/libopenjpeg/opj_malloc.h
index 1c99bcd54b3644a3fe4f95a5a6ce05f862bf6c72..0b1d4fc17fc774c99c71e3861f42980a957758c6 100644 (file)
--- a/libopenjpeg/opj_malloc.h
+++ b/libopenjpeg/opj_malloc.h
@@ -1,5 +1,5 @@
 /*\r
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team\r
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team\r
  * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>\r
  * All rights reserved.\r
  *\r
@@ -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\r
 */\r
 /* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */\r
-#ifdef WIN32\r
+#ifdef _WIN32\r
        /* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */\r
        #ifdef __GNUC__\r
                #include <mm_malloc.h>\r
@@ -80,7 +80,7 @@ Allocate memory aligned to a 16 byte boundry
                        #define HAVE_MM_MALLOC\r
                #endif\r
        #endif\r
-#else /* Not WIN32 */\r
+#else /* Not _WIN32 */\r
        #if defined(__sun)\r
                #define HAVE_MEMALIGN\r
        /* Linux x86_64 and OSX always align allocations to 16 bytes */\r