diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-27 01:28:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-27 01:28:50 +0400 |
| commit | fd15ba060b61e57fdd3dfad5bc499ae8dd348e22 (patch) | |
| tree | 4f8c74e985af29f3d5f6f48fafe5a8c504c1a75b | |
| parent | 5e2a9770f5a741014c07c5e42e4b23aa49683074 (diff) | |
[#21753] allowing to compile on FreeBSD 8.0
patch on libopenjpeg
| -rw-r--r-- | extern/libopenjpeg/opj_malloc.h | 2 | ||||
| -rw-r--r-- | extern/libopenjpeg/patches/fbsd.patch | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/extern/libopenjpeg/opj_malloc.h b/extern/libopenjpeg/opj_malloc.h index 4e9727af0f3..960bdb3ec4b 100644 --- a/extern/libopenjpeg/opj_malloc.h +++ b/extern/libopenjpeg/opj_malloc.h @@ -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 index 00000000000..90e77600941 --- /dev/null +++ b/extern/libopenjpeg/patches/fbsd.patch @@ -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 |