diff options
| author | Antonin Descampe <antonin@gmail.com> | 2008-01-16 19:01:13 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2008-01-16 19:01:13 +0000 |
| commit | 13209d2565c0c652a253320e569dd7bfcbef0b26 (patch) | |
| tree | 3a73ae23d091343111e5afa6a49d82533eba5f61 /libopenjpeg | |
| parent | 9a6f0596b07a2f9c8bcf2028db727778735a348a (diff) | |
fixed opj_malloc.h for macosx (bugfix provided by janpeder, thanks)
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/opj_malloc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libopenjpeg/opj_malloc.h b/libopenjpeg/opj_malloc.h index 57a51c62..1f117b6a 100644 --- a/libopenjpeg/opj_malloc.h +++ b/libopenjpeg/opj_malloc.h @@ -76,8 +76,10 @@ Allocate memory aligned to a 16 byte boundry #if defined(__sun)
#define HAVE_MEMALIGN
#elif defined(__GNUC__)
- #define HAVE_MEMALIGN
- #include <malloc.h>
+ #ifndef __APPLE__
+ #define HAVE_MEMALIGN
+ #include <malloc.h>
+ #endif
/* Linux x86_64 and OSX always align allocations to 16 bytes */
#elif !defined(__amd64__) && !defined(__APPLE__)
/* FIXME: Yes, this is a big assumption */
|