[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39667] branches/bmesh/blender/source/ blender: minor edits needed to build again

[Campbell Barton]

Revision: 39667
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39667
Author:   campbellbarton
Date:     2011-08-24 02:43:35 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
minor edits needed to build again

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
    branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h
    branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h	2011-08-24 02:29:45 UTC (rev 39666)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h	2011-08-24 02:43:35 UTC (rev 39667)
@@ -86,8 +86,6 @@
 /* bit-row */
 #define BROW(min, max)	(((max)>=31? 0xFFFFFFFF: (1<<(max+1))-1) - ((min)? ((1<<(min))-1):0) )
 
-#define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;}
-
 #ifdef __cplusplus
 }
 #endif

Modified: branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h	2011-08-24 02:29:45 UTC (rev 39666)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_mempool.h	2011-08-24 02:43:35 UTC (rev 39667)
@@ -42,7 +42,6 @@
 
 struct BLI_mempool;
 
-#include "BKE_utildefines.h"
 #include "BLI_listbase.h"
 #include "BLI_blenlib.h"
 #include <string.h>
@@ -92,6 +91,15 @@
 void BLI_mempool_iternew(BLI_mempool *pool, BLI_mempool_iter *iter);
 void *BLI_mempool_iterstep(BLI_mempool_iter *iter);
 
+/* XXX - copied from BKE_utildefines.h, dont use here because we're in BLI */
+#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
+	/* Big Endian */
+#define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
+#else
+	/* Little Endian */
+#define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
+#endif
+
 /************ inlined stuff ***********/
 #define FREEWORD MAKE_ID('f', 'r', 'e', 'e')
 #include "MEM_guardedalloc.h"

Modified: branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h	2011-08-24 02:29:45 UTC (rev 39666)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h	2011-08-24 02:43:35 UTC (rev 39667)
@@ -241,4 +241,6 @@
 #  define BLI_assert(a) (void)0
 #endif
 
+#define BMEMSET(mem, val, size) {unsigned int _i; char *_c = (char*) mem; for (_i=0; _i<size; _i++) *_c++ = val;}
+
 #endif // BLI_UTILDEFINES_H