diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-02 06:51:59 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-02 06:51:59 +0000 |
| commit | 4dba9aed22def5a2c4bef268eecfb3407b6ccc17 (patch) | |
| tree | 04b757006a14534398e75489691f4e908112c257 | |
| parent | a46dbe694123474be4b6ded3750bac7160f4f6ed (diff) | |
[trunk] Import opj_malloc.h from branch 1.5.x
| -rw-r--r-- | src/lib/openjp2/opj_malloc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/openjp2/opj_malloc.h b/src/lib/openjp2/opj_malloc.h index 0b1d4fc1..9e4af234 100644 --- a/src/lib/openjp2/opj_malloc.h +++ b/src/lib/openjp2/opj_malloc.h @@ -83,8 +83,10 @@ Allocate memory aligned to a 16 byte boundry #else /* Not _WIN32 */
#if defined(__sun)
#define HAVE_MEMALIGN
+ #elif defined(__FreeBSD__)
+ #define HAVE_POSIX_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__)
+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
#define HAVE_MEMALIGN
#include <malloc.h>
#endif
|