Attached patches remove BORLANDC, and hence SG_MATH_EXCEPTION_CLASH and SG_INCOM

PLETE_FUNCTIONAL from SimGear and FlightGear.

As a result, SG_HAVE_STD_INCLUDES is now *always* set, so I will get the boring
fixes for that done, but separately. I'm still auditing the other things in comp
ilers.h - there's a lot that can die now BORLAND is gone.

diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx
index f18f0a346c6162aa6867fa01fab0a621d0179b39..abb49de4389db587d117ed083e7d88afc573999b 100644 (file)
--- a/src/AIModel/AIFlightPlan.cxx
+++ b/src/AIModel/AIFlightPlan.cxx
@@ -26,9 +26,6 @@
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/constants.h>
-#ifdef __BORLANDC__
-#  define exception c_exception
-#endif
 #include <simgear/props/props.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>

diff --git a/src/ATCDCL/ATCVoice.hxx b/src/ATCDCL/ATCVoice.hxx
index 0bc501c2065498f901dcfa8122bf6d65fe8520fb..3185cc0234d0c30ac2c2a09fd2bef627af695fac 100644 (file)
--- a/src/ATCDCL/ATCVoice.hxx
+++ b/src/ATCDCL/ATCVoice.hxx
@@ -23,12 +23,7 @@
 
 #include <simgear/compiler.h>
 
-#if defined( SG_HAVE_STD_INCLUDES ) || defined( __BORLANDC__ ) || (__APPLE__)
 #  include <fstream>
-#else
-#  include <fstream.h>
-#endif
-
 #include <map>
 #include <list>
 #include <string>

diff --git a/src/ATCDCL/approach.hxx b/src/ATCDCL/approach.hxx
index ad6bea6a2c4030dbd80317cad9229c9e567d2aa3..9ea32b9c0c81077f29ea6be423c109f058462ccd 100644 (file)
--- a/src/ATCDCL/approach.hxx
+++ b/src/ATCDCL/approach.hxx
@@ -33,15 +33,7 @@
 
 #include <Main/fg_props.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
 #  include <iosfwd>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
-#  include <iostream>
-#else
-#  include <istream.h>
-#endif
 
 #include "ATC.hxx"
 #include "transmission.hxx"

diff --git a/src/ATCDCL/atis.hxx b/src/ATCDCL/atis.hxx
index c4c28e2d4c5ec623cc6e7510b84adc16bf72311e..60335e18561d5d810bfcf14a01a5f8a360bae4f2 100644 (file)
--- a/src/ATCDCL/atis.hxx
+++ b/src/ATCDCL/atis.hxx
@@ -32,13 +32,7 @@
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/timing/sg_time.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
 #  include <iosfwd>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
-#  include <iostream>
-#else
-#  include <istream.h>
-#endif
 
 #include "ATC.hxx"
 

diff --git a/src/ATCDCL/transmission.hxx b/src/ATCDCL/transmission.hxx
index 8318d5a3b2a717d22bbd5049ff19867de6f39be0..c8ee2ce10c8c37f808f45a8995e9841625541fc9 100644 (file)
--- a/src/ATCDCL/transmission.hxx
+++ b/src/ATCDCL/transmission.hxx
@@ -34,17 +34,7 @@
 
 #include <Main/fg_props.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#include <iomanip>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
-#  include <iostream>
-#else
-#  include <istream.h>
-#include <iomanip.h>
-#endif
 
 #include "ATC.hxx"
 

diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index 564b536dc90a09cd2a794feb8bfbac9784fa7b1f..703dbbc5f935cd81de445f12165e0289fc1fc433 100644 (file)
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -34,12 +34,7 @@
 #  include <windows.h>
 #endif
 
-#ifdef __BORLANDC__
-#  define exception c_exception
-#endif
-
 #include <math.h>
-
 #include <stdlib.h>
 #include <stdio.h>              // char related functions
 #include <string.h>             // strcmp()

diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index 7ff92a6fcb4b0910686ca634c2ad792d622bbbaf..b56e6cf8b9822f0fb8d409c89f38e911c90eb013 100644 (file)
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -43,10 +43,6 @@ HISTORY
 
 #include <simgear/compiler.h>
 
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
 #include STL_STRING
 
 #include <simgear/constants.h>

diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index a6b1d7e0f84c44ee1595c7e9a3df195c87b198a6..667a54b5db9e5c6a70bcf93570a5a68a933be4a2 100644 (file)
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -28,9 +28,6 @@
 #include <simgear/compiler.h>
 
 #include <stdio.h>    //    size_t
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
 
 #include STL_STRING
 

diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.cpp b/src/FDM/JSBSim/input_output/FGfdmSocket.cpp
index 7d2178433b85a7589d01e3deaa407c57dd2718f2..1c390696f153e89d1743898dc70fb7e1decdd9e2 100644 (file)
--- a/src/FDM/JSBSim/input_output/FGfdmSocket.cpp
+++ b/src/FDM/JSBSim/input_output/FGfdmSocket.cpp
@@ -55,7 +55,7 @@ FGfdmSocket::FGfdmSocket(string address, int port, int protocol)
   sckt = sckt_in = size = 0;
   connected = false;
 
-  #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
+  #if defined(_MSC_VER) || defined(__MINGW32__)
     WSADATA wsaData;
     int wsaReturnCode;
     wsaReturnCode = WSAStartup(MAKEWORD(1,1), &wsaData);
@@ -109,7 +109,7 @@ FGfdmSocket::FGfdmSocket(string address, int port)
   sckt = sckt_in = size = 0;
   connected = false;
 
-  #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
+  #if defined(_MSC_VER) || defined(__MINGW32__)
     WSADATA wsaData;
     int wsaReturnCode;
     wsaReturnCode = WSAStartup(MAKEWORD(1,1), &wsaData);
@@ -162,7 +162,7 @@ FGfdmSocket::FGfdmSocket(int port)
   connected = false;
   unsigned long NoBlock = true;
 
-  #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
+  #if defined(_MSC_VER) || defined(__MINGW32__)
     WSADATA wsaData;
     int wsaReturnCode;
     wsaReturnCode = WSAStartup(MAKEWORD(1,1), &wsaData);
@@ -180,7 +180,7 @@ FGfdmSocket::FGfdmSocket(int port)
     if (bind(sckt, (struct sockaddr*)&scktName, len) == 0) {   // successful
       cout << "Successfully bound to socket for input on port " << port << endl;
       if (listen(sckt, 5) >= 0) { // successful listen()
-        #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
+        #if defined(_MSC_VER) || defined(__MINGW32__)
           ioctlsocket(sckt, FIONBIO, &NoBlock);
           sckt_in = accept(sckt, (struct sockaddr*)&scktName, &len);
         #else
@@ -207,10 +207,6 @@ FGfdmSocket::~FGfdmSocket()
 {
   if (sckt) shutdown(sckt,2);
   if (sckt_in) shutdown(sckt_in,2);
-
-  #ifdef __BORLANDC__
-    WSACleanup();
-  #endif
   Debug(1);
 }
 
@@ -227,13 +223,13 @@ string FGfdmSocket::Receive(void)
                     // class attribute and pass as a reference?
 
   if (sckt_in <= 0) {
-    #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
+    #if defined(_MSC_VER) || defined(__MINGW32__)
       sckt_in = accept(sckt, (struct sockaddr*)&scktName, &len);
     #else
       sckt_in = accept(sckt, (struct sockaddr*)&scktName, (socklen_t*)&len);
     #endif
     if (sckt_in > 0) {
-      #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
+      #if defined(_MSC_VER) || defined(__MINGW32__)
          ioctlsocket(sckt_in, FIONBIO,&NoBlock);
       #else
          ioctl(sckt_in, FIONBIO, &NoBlock);

diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.h b/src/FDM/JSBSim/input_output/FGfdmSocket.h
index 59db72325567d8c5e99dbbfbfc5e7f00374a4e95..c8f139103ebd8308ebfe481c38ff693dcd7eb487 100644 (file)
--- a/src/FDM/JSBSim/input_output/FGfdmSocket.h
+++ b/src/FDM/JSBSim/input_output/FGfdmSocket.h
@@ -49,7 +49,7 @@ INCLUDES
 using std::cout;
 using std::endl;
 
-#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
+#if defined(_MSC_VER) || defined(__MINGW32__)
   #include <winsock.h>
   #include <io.h>
 #else

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index ac2e7d4b641648b2cdf6a3be9e348952dcabfc63..de40bda0e4f0a267b63e2f154b178bc83f392156 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -32,10 +32,6 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index ec2c4a68f97cf907f321aa35d1feecb0857cbdd4..c6abe35858b2bd16a7e9482840ddf11daba7a95a 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -30,10 +30,6 @@
 
 #include <simgear/compiler.h>
 
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index fdac2e8006e7e8e6ce5360e270b6a62cc52927e1..353818a786a3c7ad81b52d939c72c148e61a297b 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -25,11 +25,6 @@
 #  include <config.h>
 #endif
 
-// For BC 5.01 this must be included before OpenGL includes.
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>             // strcmp()

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index ba2483da0b413d7393f28c4d1ad103c12c5c6156..56204bff1c9eb15aa633e020c6d3f38b57e84ea1 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -32,10 +32,6 @@
 #  include <signal.h>
 #endif
 
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  include <math.h>
-#endif
-
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #  include <float.h>

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index 2335be1fb3c0257f663706554d8f8b65ca511df0..666966a82e1c49b362dd8b5a05dfc8173d813e78 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -32,13 +32,7 @@
 #include <simgear/compiler.h>
 #include <simgear/misc/sgstream.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
-#  include <iostream>
-#else
-#  include <istream.h>
-#endif
 
 #include STL_STRING
 

diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx
index d5ab6ec0ba197b59103ffca45e07067cb4daccf0..4767dbf450246051fe3856b1d9e2d924ceef137f 100644 (file)
--- a/src/Navaids/navrecord.hxx
+++ b/src/Navaids/navrecord.hxx
@@ -35,13 +35,7 @@
 #include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/structure/SGReferenced.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( __BORLANDC__ ) || (__APPLE__)
-#  include <iostream>
-#else
-#  include <istream.h>
-#endif
 
 #define FG_NAV_DEFAULT_RANGE 50 // nm
 #define FG_LOC_DEFAULT_RANGE 18 // nm

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index e1f7f4f231c40f89ba60145d3719a69afff75291..b158c9051ef99b1e716d5cfef4fa13f9a26014d4 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -31,9 +31,6 @@
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
-#ifdef __BORLANDC__
-#  define exception c_exception
-#endif
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/sound/xmlsound.hxx>

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index debccf586e70f4b49a145aba269f500523b24c07..cea5868090760e9285295f187163c56fd7ce6d5e 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -34,10 +34,6 @@
 
 #include SG_GL_H
 
-#ifdef SG_MATH_EXCEPTION_CLASH
-#  define exception c_exception
-#endif
-
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
 #else