[trunk] Import opj_malloc.h from branch 1.5.x

diff --git a/src/lib/openjp2/opj_malloc.h b/src/lib/openjp2/opj_malloc.h
index 0b1d4fc17fc774c99c71e3861f42980a957758c6..9e4af2349e19962f7b4a9f74c732fd2f5aaf93d2 100644 (file)
--- 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 */\r
        #if defined(__sun)\r
                #define HAVE_MEMALIGN\r
+  #elif defined(__FreeBSD__)\r
+    #define HAVE_POSIX_MEMALIGN\r
        /* Linux x86_64 and OSX always align allocations to 16 bytes */\r
-       #elif !defined(__amd64__) && !defined(__APPLE__)        \r
+       #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)\r
                #define HAVE_MEMALIGN\r
                #include <malloc.h>                     \r
        #endif\r