diff options
Diffstat (limited to 'extern/libopenjpeg/opj_malloc.h')
| -rw-r--r-- | extern/libopenjpeg/opj_malloc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extern/libopenjpeg/opj_malloc.h b/extern/libopenjpeg/opj_malloc.h index 79698f8ff1b..4e9727af0f3 100644 --- a/extern/libopenjpeg/opj_malloc.h +++ b/extern/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 */ |