Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / extern / libopenjpeg / patches / osx.patch
1 Index: opj_malloc.h
2 ===================================================================
3 --- opj_malloc.h        (revision 15089)
4 +++ opj_malloc.h        (working copy)
5 @@ -76,8 +76,10 @@
6         #if defined(__sun)
7                         #define HAVE_MEMALIGN
8                 #elif defined(__GNUC__)
9 -                       #define HAVE_MEMALIGN
10 -                       #include <malloc.h>             
11 +                        #ifndef __APPLE__
12 +                           #define HAVE_MEMALIGN
13 +                           #include <malloc.h>
14 +                        #endif
15                 /* Linux x86_64 and OSX always align allocations to 16 bytes */
16                 #elif !defined(__amd64__) && !defined(__APPLE__)        
17                         /* FIXME: Yes, this is a big assumption */