diff options
| author | Antonin Descampe <antonin@gmail.com> | 2007-02-28 15:55:03 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2007-02-28 15:55:03 +0000 |
| commit | 44ab0ccf01857376f28b590cd2cac17dec2529d7 (patch) | |
| tree | 2ccd587cdc326c7dcc0a3d8be625456e256e4b52 | |
| parent | 192e46c32f7baededf8df7b1777f8c5409110e8a (diff) | |
add an "ifdef WIN32" to "include malloc.h" to be compliant with non-WIN32 platforms.
| -rw-r--r-- | mj2/MJ2_codec/extract_j2k_from_mj2.c | 4 | ||||
| -rw-r--r-- | mj2/MJ2_codec/mj2_convert.c | 4 | ||||
| -rw-r--r-- | mj2/MJ2_codec/mj2_to_frames.c | 4 | ||||
| -rw-r--r-- | mj2/MJ2_codec/wrap_j2k_in_mj2.c | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/mj2/MJ2_codec/extract_j2k_from_mj2.c b/mj2/MJ2_codec/extract_j2k_from_mj2.c index 24f759f1..01ba6ebd 100644 --- 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 dcce84ef..9a87de53 100644 --- 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 c0fc39d6..39415f35 100644 --- 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 e777220b..a193438d 100644 --- 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> |