Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / extern / libopenjpeg / opj_malloc.h
index 79698f8ff1ba795ab077243cc91178c568c7c868..4e9727af0f37e62adac412ac15da3d5f8672148f 100644 (file)
@@ -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 */