From d23bf097128b4baf032d14c345e9d97656f2da78 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Sat, 22 Jun 2013 20:00:17 +0000 Subject: build fix for old gccs (after rev.57620) enabling the new pragmas only when gcc >= 4.6 gcc 4.2.1 here (OSX) --- source/blender/blenlib/intern/BLI_ghash.c | 2 ++ source/blender/blenlib/intern/BLI_heap.c | 2 ++ source/blender/blenlib/intern/BLI_mempool.c | 2 ++ 3 files changed, 6 insertions(+) (limited to 'source/blender/blenlib/intern') diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index 5cd5a904996..1b585b940e4 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -44,9 +44,11 @@ #ifdef __GNUC__ # 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" #endif +#endif const unsigned int hashsizes[] = { 5, 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, diff --git a/source/blender/blenlib/intern/BLI_heap.c b/source/blender/blenlib/intern/BLI_heap.c index 93c99fed8e2..8b849753df7 100644 --- a/source/blender/blenlib/intern/BLI_heap.c +++ b/source/blender/blenlib/intern/BLI_heap.c @@ -41,9 +41,11 @@ #ifdef __GNUC__ # 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" #endif +#endif /***/ diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index ff9a5abfaa1..59372534340 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -45,9 +45,11 @@ #ifdef __GNUC__ # 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" #endif +#endif /* note: copied from BLO_blend_defs.h, don't use here because we're in BLI */ #ifdef __BIG_ENDIAN__ -- cgit v1.2.3