[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15185] trunk/blender/extern/libopenjpeg: == redcode ==

[Peter Schlaile]

Revision: 15185
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15185
Author:   schlaile
Date:     2008-06-10 07:12:51 +0200 (Tue, 10 Jun 2008)

Log Message:
-----------
== redcode ==

This makes it work for Mac OS X. Thanks to Jean-Luc Peuriere for the patch.

Modified Paths:
--------------
    trunk/blender/extern/libopenjpeg/opj_malloc.h

Added Paths:
-----------
    trunk/blender/extern/libopenjpeg/patches/
    trunk/blender/extern/libopenjpeg/patches/osx.patch

Modified: trunk/blender/extern/libopenjpeg/opj_malloc.h
===================================================================
--- trunk/blender/extern/libopenjpeg/opj_malloc.h       2008-06-09 23:54:22 UTC 
(rev 15184)
+++ trunk/blender/extern/libopenjpeg/opj_malloc.h       2008-06-10 05:12:51 UTC 
(rev 15185)
@@ -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 */

Added: trunk/blender/extern/libopenjpeg/patches/osx.patch
===================================================================
--- trunk/blender/extern/libopenjpeg/patches/osx.patch                          
(rev 0)
+++ trunk/blender/extern/libopenjpeg/patches/osx.patch  2008-06-10 05:12:51 UTC 
(rev 15185)
@@ -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 */


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs