FG_ to SG_ name changes.

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index e4d3711965aee0a1da8f9c8e5d75e24cd1e409af..1486a5136b06a35a18525ffac997977bb60ed8ce 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -124,7 +124,7 @@ public:
 
 class FGAirportsUtil {
 public:
-#ifdef FG_NO_DEFAULT_TEMPLATE_ARGS
+#ifdef SG_NO_DEFAULT_TEMPLATE_ARGS
     typedef set< FGAirport, less< FGAirport > > container;
 #else
     typedef set< FGAirport > container;

diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index 06ea98db02fd374237cb7f7d2d36e29ddceb1ba7..ec6f6feed789aa18d80ce667c59e9af907e31ccd 100644 (file)
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -39,7 +39,7 @@ HISTORY
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index 923ae1980097ae838273c7fad4992c44de95b6f7..b49872a6a7233787be2acb1f6d6e2b58c5e73953 100644 (file)
--- a/src/FDM/JSBSim.cxx
+++ b/src/FDM/JSBSim.cxx
@@ -23,7 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index fb7f1f839f76bb8f1e4323ceb14567fad7e3cdd1..2019f70717a36a764c3b0ade0c75c28113b6bdc8 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -30,7 +30,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index 32eb57247b5300dda70139dce59470e7f48d31a3..2b1eb0a72dcd9bc936fa1b695bafeb71d0de8c8f 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -30,7 +30,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index a052cafc14ac8245d16cd57b85b18eda423be099..473bf56ef16805cb429cd97f443066a54c6e04b7 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -27,7 +27,7 @@
 #endif
 
 // For BC 5.01 this must be included before OpenGL includes.
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Main/fgfs.hxx b/src/Main/fgfs.hxx
index b2e8c7ac6acbdec8da454b3ede90936ec90c4d59..834c6d4dfc54f64a28637a6db537bd045dc0e2f3 100644 (file)
--- a/src/Main/fgfs.hxx
+++ b/src/Main/fgfs.hxx
@@ -29,7 +29,7 @@
 #  include <config.h>
 #endif
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index d669b9072b67a97de5b4f40d99084ca9b02af574..196619393aa8c7422a0d59862e96861990fcedcb 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index 3ac6ca3459744ba86b288a2b19d52bd623bb1810..21ddc0e806ce1c0a1870ae00a5333d2f323a0c28 100644 (file)
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -26,7 +26,7 @@
 #  include <config.h>
 #endif
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Objects/matlib.cxx b/src/Objects/matlib.cxx
index 839fe721b63fbb5946ff314d3f11ff9936a4a59f..69f9c2b5a363553609a853ab51e5d8c2627be86c 100644 (file)
--- a/src/Objects/matlib.cxx
+++ b/src/Objects/matlib.cxx
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Objects/newmat.cxx b/src/Objects/newmat.cxx
index 3f11930726725c5979cc4eabdb507e2e6c0eb9be..4e1fcc75b4bd977961b6057cf0561708e7a8a2e2 100644 (file)
--- a/src/Objects/newmat.cxx
+++ b/src/Objects/newmat.cxx
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index 71e03f28109be0cd8b79513493953ef21242334a..a2922c8faa41a05cead508fa07a201cda379d2bc 100644 (file)
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index dda39841a02fd9fdf261c19e3659b8aaabfff88d..70139a3db7d99ae356298e5de2a145388bb28883 100644 (file)
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -23,7 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Time/event.cxx b/src/Time/event.cxx
index c5cb4e61a3150423e9db0d9f65881eb189942760..6d079019869288e903db99fb74512a2a495c06a0 100644 (file)
--- a/src/Time/event.cxx
+++ b/src/Time/event.cxx
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  include <math.h>
 #endif
 

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index a7dcda076d82ae371994c3f455f9eb2e02adee3c..57aaeaca200077ca86d5dd4ab0a240c9546c1006 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -35,7 +35,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_MATH_EXCEPTION_CLASH
+#ifdef SG_MATH_EXCEPTION_CLASH
 #  define exception c_exception
 #endif