diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-01 19:03:44 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-09-01 19:03:44 +0400 |
| commit | b18f77abfdc6553c5d86200062126cf441207b2f (patch) | |
| tree | 07947a730c56613118eb1bdbcd73f959ea59ffc3 /source/blender | |
| parent | 35b61a7512dc1b8b1d8bc562aad2a72d254b8a69 (diff) | |
OSX/gcc4.6+: fix compiling, -Wconversion causes ann weeror in gcc's own stdio.h else
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/BLI_strict_flags.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h index 5c5a6f45f0c..18d899e5702 100644 --- a/source/blender/blenlib/BLI_strict_flags.h +++ b/source/blender/blenlib/BLI_strict_flags.h @@ -31,7 +31,9 @@ # pragma GCC diagnostic error "-Wsign-conversion" # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406 /* gcc4.6+ only */ # pragma GCC diagnostic error "-Wsign-compare" -# pragma GCC diagnostic error "-Wconversion" +# ifndef __APPLE__ /* gcc4.6+ on Apple would fail in stdio.h */ +# pragma GCC diagnostic error "-Wconversion" +# endif # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 /* gcc4.8+ only (behavior changed to ignore globals)*/ # pragma GCC diagnostic error "-Wshadow" |