add an "ifdef WIN32" to "include malloc.h" to be compliant with non-WIN32 platforms.

diff --git a/mj2/MJ2_codec/extract_j2k_from_mj2.c b/mj2/MJ2_codec/extract_j2k_from_mj2.c
index 24f759f1a86dacad4338166dbcd26780d7ae2803..01ba6ebdc83babf769aa59f7e7c5449f1277f699 100644 (file)
--- a/mj2/MJ2_codec/extract_j2k_from_mj2.c
+++ b/mj2/MJ2_codec/extract_j2k_from_mj2.c
@@ -1,5 +1,9 @@
 #include <stdio.h>
+#ifdef WIN32
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
 #include <setjmp.h>
 
 #include "mj2.h"

diff --git a/mj2/MJ2_codec/mj2_convert.c b/mj2/MJ2_codec/mj2_convert.c
index dcce84ef3c7d315d93e2f002298ccd8ed57e4af1..9a87de532adcc696d83fe5be3b378fee987b07c6 100644 (file)
--- a/mj2/MJ2_codec/mj2_convert.c
+++ b/mj2/MJ2_codec/mj2_convert.c
@@ -1,5 +1,9 @@
 #include <stdio.h>
+#ifdef WIN32
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
 
 #include "mj2.h"
 #include <j2k.h>

diff --git a/mj2/MJ2_codec/mj2_to_frames.c b/mj2/MJ2_codec/mj2_to_frames.c
index c0fc39d66ba44951dd9522a815f2644e2f89bc3f..39415f35989b7e02dfb5e7f61cb6e46a9c0578ca 100644 (file)
--- a/mj2/MJ2_codec/mj2_to_frames.c
+++ b/mj2/MJ2_codec/mj2_to_frames.c
@@ -1,5 +1,9 @@
 #include <stdio.h>
+#ifdef WIN32
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
 #include <setjmp.h>
 
 #include "mj2.h"

diff --git a/mj2/MJ2_codec/wrap_j2k_in_mj2.c b/mj2/MJ2_codec/wrap_j2k_in_mj2.c
index e777220bf8f87bbd006a069f6ecc52412a28bcb1..a193438d274c379a17a7eeca83237c262fff37ad 100644 (file)
--- a/mj2/MJ2_codec/wrap_j2k_in_mj2.c
+++ b/mj2/MJ2_codec/wrap_j2k_in_mj2.c
@@ -1,5 +1,9 @@
 #include <stdio.h>
+#ifdef WIN32
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
 #include <setjmp.h>
 #include <string.h>