[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28444] trunk/blender/extern/libopenjpeg: [#21753] allowing to compile on FreeBSD 8.0

[Campbell Barton]

Revision: 28444
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28444
Author:   campbellbarton
Date:     2010-04-26 23:28:50 +0200 (Mon, 26 Apr 2010)

Log Message:
-----------
[#21753] allowing to compile on FreeBSD 8.0
patch on libopenjpeg

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

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

Modified: trunk/blender/extern/libopenjpeg/opj_malloc.h
===================================================================
--- trunk/blender/extern/libopenjpeg/opj_malloc.h	2010-04-26 21:25:14 UTC (rev 28443)
+++ trunk/blender/extern/libopenjpeg/opj_malloc.h	2010-04-26 21:28:50 UTC (rev 28444)
@@ -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

Added: trunk/blender/extern/libopenjpeg/patches/fbsd.patch
===================================================================
--- trunk/blender/extern/libopenjpeg/patches/fbsd.patch	                        (rev 0)
+++ trunk/blender/extern/libopenjpeg/patches/fbsd.patch	2010-04-26 21:28:50 UTC (rev 28444)
@@ -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