[trunk] WIP: update jp2 dump functions with the new V2 framework

[openjpeg.git] / libopenjpeg / opj_malloc.h

diff --git a/libopenjpeg/opj_malloc.h b/libopenjpeg/opj_malloc.h
index c477aec0f294ec565b8c893c75dea9286d2c2067..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
@@ -130,22 +130,22 @@ Allocate memory aligned to a 16 byte boundry
 \r
 /**\r
 Reallocate memory blocks.\r
-@param memblock Pointer to previously allocated memory block\r
-@param size New size in bytes\r
+@param m Pointer to previously allocated memory block\r
+@param s New size in bytes\r
 @return Returns a void pointer to the reallocated (and possibly moved) memory block\r
 */\r
 #ifdef ALLOC_PERF_OPT\r
-void * OPJ_CALLCONV opj_realloc(void * _Memory, size_t NewSize);\r
+void * OPJ_CALLCONV opj_realloc(void * m, size_t s);\r
 #else\r
 #define opj_realloc(m, s) realloc(m, s)\r
 #endif\r
 \r
 /**\r
 Deallocates or frees a memory block.\r
-@param memblock Previously allocated memory block to be freed\r
+@param m Previously allocated memory block to be freed\r
 */\r
 #ifdef ALLOC_PERF_OPT\r
-void OPJ_CALLCONV opj_free(void * _Memory);\r
+void OPJ_CALLCONV opj_free(void * m);\r
 #else\r
 #define opj_free(m) free(m)\r
 #endif\r