[1.5] fix output when --disable-shared or --disable-static is

[openjpeg.git] / libopenjpeg / j2k_lib.c

diff --git a/libopenjpeg/j2k_lib.c b/libopenjpeg/j2k_lib.c
index ac030a29e5ca418309c2c415d9fb051f3b640366..a66e31e9afb3150d5650714815957177193c8cdc 100644 (file)
--- a/libopenjpeg/j2k_lib.c
+++ b/libopenjpeg/j2k_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24,18 +24,18 @@
  * 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(void) {
-#ifdef WIN32
-       /* WIN32: use QueryPerformance (very accurate) */
+#ifdef _WIN32
+       /* _WIN32: use QueryPerformance (very accurate) */
     LARGE_INTEGER freq , t ;
     /* freq is the clock speed of the CPU */
     QueryPerformanceFrequency(&freq) ;
@@ -57,20 +57,3 @@ double opj_clock(void) {
 #endif
 }
 
-void* opj_malloc( size_t size ) {
-       void *memblock = malloc(size);
-       if(memblock) {
-               memset(memblock, 0, size);
-       }
-       return memblock;
-}
-
-void* opj_realloc( void *memblock, size_t size ) {
-       return realloc(memblock, size);
-}
-
-void opj_free( void *memblock ) {
-       free(memblock);
-}
-
-