diff options
| author | Peter Schlaile <peter@schlaile.de> | 2008-06-10 09:12:51 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2008-06-10 09:12:51 +0400 |
| commit | f72d450ae99927e7240f62900af4608a5db2d664 (patch) | |
| tree | aaefa9722104cb9ed8ce6c48dc84b0aab26eab61 /extern/libopenjpeg | |
| parent | 192037960d0b0f104aee6a8652bf1f410d880b1f (diff) | |
== redcode ==
This makes it work for Mac OS X. Thanks to Jean-Luc Peuriere for the patch.
Diffstat (limited to 'extern/libopenjpeg')
| -rw-r--r-- | extern/libopenjpeg/opj_malloc.h | 6 | ||||
| -rw-r--r-- | extern/libopenjpeg/patches/osx.patch | 17 |
2 files changed, 21 insertions, 2 deletions
diff --git a/extern/libopenjpeg/opj_malloc.h b/extern/libopenjpeg/opj_malloc.h index 79698f8ff1b..4e9727af0f3 100644 --- a/extern/libopenjpeg/opj_malloc.h +++ b/extern/libopenjpeg/opj_malloc.h @@ -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 */ diff --git a/extern/libopenjpeg/patches/osx.patch b/extern/libopenjpeg/patches/osx.patch new file mode 100644 index 00000000000..c518978eed6 --- /dev/null +++ b/extern/libopenjpeg/patches/osx.patch @@ -0,0 +1,17 @@ +Index: opj_malloc.h +=================================================================== +--- opj_malloc.h (revision 15089) ++++ opj_malloc.h (working copy) +@@ -76,8 +76,10 @@ + #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 */ |