Borland portability tweaks.

diff --git a/Astro/celestialBody.cxx b/Astro/celestialBody.cxx
index baa0646c98c7e8500568babfd8ef5599a608a483..72bb6359aed968fe0e1692d1bc39f3a4ec2b1d28 100644 (file)
--- a/Astro/celestialBody.cxx
+++ b/Astro/celestialBody.cxx
@@ -27,6 +27,11 @@
 #include "star.hxx"
 #include <Debug/logstream.hxx>
 
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 /**************************************************************************
  * void CelestialBody::updatePosition(fgTIME *t, Star *ourSun)
  *

diff --git a/Astro/celestialBody.hxx b/Astro/celestialBody.hxx
index 864e090ad6ce9e6d38b4eadf616be54cd99c57e3..a61a25d3960078793e1b27ca029981a23315e5ed 100644 (file)
--- a/Astro/celestialBody.hxx
+++ b/Astro/celestialBody.hxx
@@ -32,9 +32,6 @@
 #endif                                   
 
 
-#include <stdio.h>
-#include <math.h>
-
 #include <Time/fg_time.hxx>
 #include <Include/fg_constants.h>
 

diff --git a/Astro/jupiter.cxx b/Astro/jupiter.cxx
index cde5521c06f8fe07f72dd98a916c167bcfe6f9bb..caa0e50750264c492a75a03cc6fc68c53da67474 100644 (file)
--- a/Astro/jupiter.cxx
+++ b/Astro/jupiter.cxx
@@ -23,6 +23,12 @@
  * (Log is kept at end of this file)
  **************************************************************************/
 
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "jupiter.hxx"
 
 /*************************************************************************

diff --git a/Astro/mars.cxx b/Astro/mars.cxx
index ccfc59970e288350ba4dade555e3df38897cd253..5f430c870cb54d4fb7875825846dd2aa49b55f51 100644 (file)
--- a/Astro/mars.cxx
+++ b/Astro/mars.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "mars.hxx"
 
 /*************************************************************************

diff --git a/Astro/mercury.cxx b/Astro/mercury.cxx
index 104a9daec24e44f6b83b9c6182b84598bbc29669..f8c3d67264a79541c8bde5a9f68c98bf39113daf 100644 (file)
--- a/Astro/mercury.cxx
+++ b/Astro/mercury.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "mercury.hxx"
 
 /*************************************************************************

diff --git a/Astro/moon.cxx b/Astro/moon.cxx
index 445774cd646e10446630cef6e1d36049ef9530a2..5ec50f4b5fc99e9b62e2e5280ad54e9be4d9ce09 100644 (file)
--- a/Astro/moon.cxx
+++ b/Astro/moon.cxx
@@ -29,6 +29,12 @@
 #include <Debug/logstream.hxx>
 #include <Objects/texload.h>
 
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 static GLuint moon_texid;
 static GLubyte *moon_texbuf;
 

diff --git a/Astro/neptune.cxx b/Astro/neptune.cxx
index cbcbcae96b4321d77e75aac0df3de00c2fac6206..dce7190000b60b1c87391eb866a19020a3ae05b7 100644 (file)
--- a/Astro/neptune.cxx
+++ b/Astro/neptune.cxx
@@ -23,6 +23,11 @@
  * (Log is kept at end of this file)
  **************************************************************************/
 
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "neptune.hxx"
 
 /*************************************************************************

diff --git a/Astro/saturn.cxx b/Astro/saturn.cxx
index c58f3836e4668fe1af015465bd6778049e8540fb..5f643dc14467762513819f4b5d12f4906cfa3f7f 100644 (file)
--- a/Astro/saturn.cxx
+++ b/Astro/saturn.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "saturn.hxx"
 
 /*************************************************************************

diff --git a/Astro/solarsystem.cxx b/Astro/solarsystem.cxx
index c3995f48eca89d22ff4a287c85ac194d28dae06c..3aa13fbf70255b9a0eb94f388316e37417615b74 100644 (file)
--- a/Astro/solarsystem.cxx
+++ b/Astro/solarsystem.cxx
@@ -31,6 +31,12 @@
 #  include <windows.h>
 #endif
 
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 #include <Debug/logstream.hxx>

diff --git a/Astro/star.cxx b/Astro/star.cxx
index f43eeba33e0513762f1eb3533fa3bac5ef6752c5..f8ce2d3a13602c29dff025cf3d5f4aa0805bf515 100644 (file)
--- a/Astro/star.cxx
+++ b/Astro/star.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "star.hxx"
 
 /*************************************************************************

diff --git a/Astro/stars.cxx b/Astro/stars.cxx
index ac20f6120f551032a9a34cdb47bbec8ddb968494..af910f77dbf9b81a98aa21b0475fee6afacfc635 100644 (file)
--- a/Astro/stars.cxx
+++ b/Astro/stars.cxx
@@ -31,6 +31,7 @@
 #  include <windows.h>
 #endif
 
+
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
@@ -255,6 +256,9 @@ void fgStarsRender( void ) {
 
 
 // $Log$
+// Revision 1.23  1998/11/23 21:48:28  curt
+// Borland portability tweaks.
+//
 // Revision 1.22  1998/11/07 19:07:07  curt
 // Enable release builds using the --without-logging option to the configure
 // script.  Also a couple log message cleanups, plus some C to C++ comment

diff --git a/Astro/uranus.cxx b/Astro/uranus.cxx
index e21b06a6bfbe1251c8a08985f0f893bbee444ca8..c20a9180709b15c5cd50f415b7d74da9acd919a0 100644 (file)
--- a/Astro/uranus.cxx
+++ b/Astro/uranus.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "uranus.hxx"
 
 /*************************************************************************

diff --git a/Astro/venus.cxx b/Astro/venus.cxx
index 3e07e7997810f7ae65cfc6950c9af5cb385760d1..81088ffd1930a4d0fd9276777043dcb19cd13582 100644 (file)
--- a/Astro/venus.cxx
+++ b/Astro/venus.cxx
@@ -22,6 +22,12 @@
  * $Id$
  * (Log is kept at end of this file)
  **************************************************************************/
+
+#ifdef __BORLANDC__
+#  define exception c_exception
+#endif
+#include <math.h>
+
 #include "venus.hxx"
 
 /*************************************************************************