Prefix GCC version constant.

From: Markus Wanner <markus@bluegap.ch>

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 5a1cd47733cf984205be5d8db81e7cc2d809e904..2686ea1ff0f3c0507ee107963c7a51a09f912341 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -46,7 +46,7 @@
 #    warning GCC compilers prior to 3.4 are suspect  
 #  endif
 
-#  define GCC_VERSION (__GNUC__ * 10000 \
+#  define SG_GCC_VERSION (__GNUC__ * 10000 \
                      + __GNUC_MINOR__ * 100 \
                      + __GNUC_PATCHLEVEL__)
 #  define SG_COMPILER_STR "GNU C++ version " SG_STRINGIZE(__GNUC__) "." SG_STRINGIZE(__GNUC_MINOR__)

diff --git a/simgear/nasal/cppbind/Ghost.hxx b/simgear/nasal/cppbind/Ghost.hxx
index c403a3077fd0afbf6a777966f13a4f723e76691d..2732c3a1c663648269b48995a5cd6ad53be770bb 100644 (file)
--- a/simgear/nasal/cppbind/Ghost.hxx
+++ b/simgear/nasal/cppbind/Ghost.hxx
@@ -325,7 +325,7 @@ namespace nasal
           // Both ways of retrieving the address of a static member function
           // should be legal but not all compilers know this.
           // g++-4.4.7+ has been tested to work with both versions
-#if defined(GCC_VERSION) && GCC_VERSION < 40407
+#if defined(SG_GCC_VERSION) && SG_GCC_VERSION < 40407
           // The old version of g++ used on Jenkins (16.11.2012) only compiles
           // this version.
           &getTypeFor<BaseGhost>