[#21753] allowing to compile on FreeBSD 8.0
authorCampbell Barton <ideasman42@gmail.com>
Mon, 26 Apr 2010 21:28:50 +0000 (21:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 26 Apr 2010 21:28:50 +0000 (21:28 +0000)
patch on libopenjpeg

extern/libopenjpeg/opj_malloc.h
extern/libopenjpeg/patches/fbsd.patch [new file with mode: 0644]

index 4e9727af0f37e62adac412ac15da3d5f8672148f..960bdb3ec4b53cfac0a9c3bbb62d21af7671621b 100644 (file)
@@ -76,7 +76,7 @@ Allocate memory aligned to a 16 byte boundry
        #if defined(__sun)
                        #define HAVE_MEMALIGN
                #elif defined(__GNUC__)
-                        #ifndef __APPLE__
+                        #if !defined(__APPLE__) && !defined(__FreeBSD__)
                            #define HAVE_MEMALIGN
                            #include <malloc.h>
                         #endif
diff --git a/extern/libopenjpeg/patches/fbsd.patch b/extern/libopenjpeg/patches/fbsd.patch
new file mode 100644 (file)
index 0000000..90e7760
--- /dev/null
@@ -0,0 +1,13 @@
+Index: extern/libopenjpeg/opj_malloc.h
+===================================================================
+--- extern/libopenjpeg/opj_malloc.h    (revision 27736)
++++ extern/libopenjpeg/opj_malloc.h    (working copy)
+@@ -76,7 +76,7 @@
+       #if defined(__sun)
+                       #define HAVE_MEMALIGN
+               #elif defined(__GNUC__)
+-                        #ifndef __APPLE__
++                        #if !defined(__APPLE__) && !defined(__FreeBSD__)
+                           #define HAVE_MEMALIGN
+                           #include <malloc.h>
+                         #endif