From 663964d94cc281ee6e2890b4ffac1c50414b61ba Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Mon, 23 Nov 1998 21:48:09 +0000
Subject: [PATCH] Borland portability tweaks.

---
 Astro/celestialBody.cxx | 5 +++++
 Astro/celestialBody.hxx | 3 ---
 Astro/jupiter.cxx       | 6 ++++++
 Astro/mars.cxx          | 6 ++++++
 Astro/mercury.cxx       | 6 ++++++
 Astro/moon.cxx          | 6 ++++++
 Astro/neptune.cxx       | 5 +++++
 Astro/saturn.cxx        | 6 ++++++
 Astro/solarsystem.cxx   | 6 ++++++
 Astro/star.cxx          | 6 ++++++
 Astro/stars.cxx         | 4 ++++
 Astro/uranus.cxx        | 6 ++++++
 Astro/venus.cxx         | 6 ++++++
 13 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/Astro/celestialBody.cxx b/Astro/celestialBody.cxx
index baa0646c..72bb6359 100644
--- 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 864e090a..a61a25d3 100644
--- 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 cde5521c..caa0e507 100644
--- 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 ccfc5997..5f430c87 100644
--- 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 104a9dae..f8c3d672 100644
--- 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 445774cd..5ec50f4b 100644
--- 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 cbcbcae9..dce71900 100644
--- 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 c58f3836..5f643dc1 100644
--- 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 c3995f48..3aa13fbf 100644
--- 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 f43eeba3..f8ce2d3a 100644
--- 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 ac20f612..af910f77 100644
--- 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 e21b06a6..c20a9180 100644
--- 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 3e07e799..81088ffd 100644
--- 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"
 
 /*************************************************************************