diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-03 08:39:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-03 08:39:12 +0400 |
| commit | 2dc988df8c053517d74f9280435e0a55a449a4c6 (patch) | |
| tree | 40d9a6cbd033c4764063500c813dbe14c2cc133a /source/blender/blenlib/BLI_strict_flags.h | |
| parent | 8f1e51a7d96a469718e5281aac66ac086da474a1 (diff) | |
reorder BLI_strict_flags.h include so its not conflicting with stdio.h on apple.
Diffstat (limited to 'source/blender/blenlib/BLI_strict_flags.h')
| -rw-r--r-- | source/blender/blenlib/BLI_strict_flags.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h index 18d899e5702..5c5a6f45f0c 100644 --- a/source/blender/blenlib/BLI_strict_flags.h +++ b/source/blender/blenlib/BLI_strict_flags.h @@ -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" |