[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59759] trunk/blender: reorder BLI_strict_flags.h include so its not conflicting with stdio. h on apple.

[Campbell Barton]

Revision: 59759
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59759
Author:   campbellbarton
Date:     2013-09-03 04:39:12 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
reorder BLI_strict_flags.h include so its not conflicting with stdio.h on apple.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mallocn.c
    trunk/blender/source/blender/blenlib/BLI_strict_flags.h
    trunk/blender/source/blender/blenlib/intern/BLI_mempool.c
    trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c	2013-09-03 03:04:44 UTC (rev 59758)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c	2013-09-03 04:39:12 UTC (rev 59759)
@@ -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"
@@ -59,6 +56,10 @@
 
 #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
 

Modified: trunk/blender/source/blender/blenlib/BLI_strict_flags.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_strict_flags.h	2013-09-03 03:04:44 UTC (rev 59758)
+++ trunk/blender/source/blender/blenlib/BLI_strict_flags.h	2013-09-03 04:39:12 UTC (rev 59759)
@@ -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"

Modified: trunk/blender/source/blender/blenlib/intern/BLI_mempool.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_mempool.c	2013-09-03 03:04:44 UTC (rev 59758)
+++ trunk/blender/source/blender/blenlib/intern/BLI_mempool.c	2013-09-03 04:39:12 UTC (rev 59759)
@@ -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 */

Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c	2013-09-03 03:04:44 UTC (rev 59758)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bisect_plane.c	2013-09-03 04:39:12 UTC (rev 59759)
@@ -43,12 +43,13 @@
 #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 */