reorder BLI_strict_flags.h include so its not conflicting with stdio.h on apple.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Sep 2013 04:39:12 +0000 (04:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Sep 2013 04:39:12 +0000 (04:39 +0000)
intern/guardedalloc/intern/mallocn.c
source/blender/blenlib/BLI_strict_flags.h
source/blender/blenlib/intern/BLI_mempool.c
source/blender/bmesh/tools/bmesh_bisect_plane.c

index 8fa9cb90c8e023b6b1bdc055c106a69934ffae6e..e8102d983451a32544e53ecde9fcf7849830793e 100644 (file)
@@ -37,9 +37,6 @@
 #include <stdarg.h>
 #include <sys/types.h>
 
-/* to ensure strict conversions */
-#include "../../source/blender/blenlib/BLI_strict_flags.h"
-
 /* mmap exception */
 #if defined(WIN32)
 #  include "mmap_win.h"
 
 #include "MEM_guardedalloc.h"
 
+/* to ensure strict conversions */
+#include "../../source/blender/blenlib/BLI_strict_flags.h"
+
+
 /* should always be defined except for experimental cases */
 #ifdef WITH_GUARDEDALLOC
 
index 18d899e5702775b3c4d57f096696e967561a58aa..5c5a6f45f0cd3ae3989d2e511f590cf42e6e0976 100644 (file)
@@ -31,9 +31,7 @@
 #  pragma GCC diagnostic error "-Wsign-conversion"
 #  if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406  /* gcc4.6+ only */
 #    pragma GCC diagnostic error "-Wsign-compare"
-#      ifndef __APPLE__ /* gcc4.6+ on Apple would fail in stdio.h */
-#        pragma GCC diagnostic error "-Wconversion"
-#      endif
+#    pragma GCC diagnostic error "-Wconversion"
 #  endif
 #  if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408  /* gcc4.8+ only (behavior changed to ignore globals)*/
 #    pragma GCC diagnostic error "-Wshadow"
index feeda151b5be1b9dc6cb216e450f22d8b7505db7..febf09745fb583baaaf5556c74ab8160c0c480c8 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "BLI_utildefines.h"
 #include "BLI_listbase.h"
-#include "BLI_strict_flags.h"
 
 #include "BLI_mempool.h" /* own include */
 
@@ -44,6 +43,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_strict_flags.h"  /* keep last */
+
+
 /* note: copied from BLO_blend_defs.h, don't use here because we're in BLI */
 #ifdef __BIG_ENDIAN__
 /* Big Endian */
index bfe710d9fddd101c7344da7538dfad1de8e9a577..3baf8675a0db74528a1236dbca4c7e29e34286a8 100644 (file)
 #include "BLI_linklist.h"
 #include "BLI_linklist_stack.h"
 #include "BLI_math.h"
-#include "BLI_strict_flags.h"
 
 #include "bmesh.h"
 #include "bmesh_bisect_plane.h"  /* own include */
 
+#include "BLI_strict_flags.h"  /* keep last */
+
 
 /* -------------------------------------------------------------------- */
 /* Math utils */