Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2008-06-10 09:12:51 +0400
committerPeter Schlaile <peter@schlaile.de>2008-06-10 09:12:51 +0400
commitf72d450ae99927e7240f62900af4608a5db2d664 (patch)
treeaaefa9722104cb9ed8ce6c48dc84b0aab26eab61 /extern/libopenjpeg/patches
parent192037960d0b0f104aee6a8652bf1f410d880b1f (diff)
== redcode ==
This makes it work for Mac OS X. Thanks to Jean-Luc Peuriere for the patch.
Diffstat (limited to 'extern/libopenjpeg/patches')
-rw-r--r--extern/libopenjpeg/patches/osx.patch17
1 files changed, 17 insertions, 0 deletions
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 */