Changed #ifdef FILE_H to #ifdef _FILE_H

diff --git a/Astro/moon.h b/Astro/moon.h
index b81d98183e9cb6b6f3744d1171819d5720c743f6..b5f803e0631a9f20e7f7b49f59bd9cfe5cfbff4f 100644 (file)
--- a/Astro/moon.h
+++ b/Astro/moon.h
@@ -22,8 +22,8 @@
  **************************************************************************/
 
 
-#ifndef _MOON_H_
-#define _MOON_H_
+#ifndef _MOON_H
+#define _MOON_H
 
 
 #include <Astro/orbits.h>
@@ -47,14 +47,17 @@ struct CelestialCoord fgCalculateMoon(struct OrbElements Params,
 
 extern struct OrbElements pltOrbElements[9];
 
-#endif /* _MOON_H_ */
+#endif /* _MOON_H */
 
 
 /* $Log$
-/* Revision 1.3  1998/01/19 19:26:58  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.4  1998/01/22 02:59:27  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.3  1998/01/19 19:26:58  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.2  1998/01/19 18:40:17  curt
  * Tons of little changes to clean up the code and to remove fatal errors
  * when building with the c++ compiler.

diff --git a/Astro/orbits.c b/Astro/orbits.c
index 5ce2ae9405737b043bd2a628ee3b5b30b9fa8243..432dfc7dd35811df13e3242e69faee143942fa24 100644 (file)
--- a/Astro/orbits.c
+++ b/Astro/orbits.c
@@ -23,6 +23,7 @@
  **************************************************************************/
 
 
+#include <math.h>
 #include <string.h>
 
 #include <Astro/orbits.h>
@@ -81,7 +82,7 @@ double fgCalcEccAnom(double M, double e)
         do
         {
                E1 = E0 - (E0 - e * sin(E0) - M) / (1 - e * cos(E0));
-            diff = abs(E0 - E1);
+            diff = fabs(E0 - E1);
             E0 = E1;
                }
         while (diff > fgDegToRad(0.001));
@@ -173,10 +174,13 @@ void fgSolarSystemUpdate(struct OrbElements *planet, struct fgTIME t)
 
 
 /* $Log$
-/* Revision 1.2  1998/01/19 19:26:58  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.3  1998/01/22 02:59:27  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.2  1998/01/19 19:26:58  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.1  1998/01/07 03:16:17  curt
  * Moved from .../Src/Scenery/ to .../Src/Astro/
  *

diff --git a/Astro/orbits.h b/Astro/orbits.h
index daf99dc27b0f463b5310e52b3f9c155262a8ff1a..d9ceb9dec42d7adf584f1de4b5f4658f9addf6c0 100644 (file)
--- a/Astro/orbits.h
+++ b/Astro/orbits.h
@@ -23,8 +23,8 @@
  **************************************************************************/
 
 
-#ifndef ORBITS_H
-#define ORBITS_H
+#ifndef _ORBITS_H
+#define _ORBITS_H
 
 
 #include <stdio.h>
@@ -77,14 +77,17 @@ void fgSolarSystemInit(struct fgTIME t);
 void fgSolarSystemUpdate(struct OrbElements *planets, struct fgTIME t);
 
 
-#endif /* ORBITS_H */
+#endif /* _ORBITS_H */
 
 
 /* $Log$
-/* Revision 1.2  1998/01/19 19:26:58  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.3  1998/01/22 02:59:27  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.2  1998/01/19 19:26:58  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.1  1998/01/07 03:16:17  curt
  * Moved from .../Src/Scenery/ to .../Src/Astro/
  *

diff --git a/Astro/planets.h b/Astro/planets.h
index 6cf8748967586b65226a4e9133732c630ce74624..d5f10b9030829f64ef3a8b90a035bb733e3ac837 100644 (file)
--- a/Astro/planets.h
+++ b/Astro/planets.h
@@ -23,8 +23,8 @@
  **************************************************************************/
 
 
-#ifndef PLANETS_H
-#define PLANETS_H
+#ifndef _PLANETS_H
+#define _PLANETS_H
 
 
 struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
@@ -35,9 +35,12 @@ struct CelestialCoord fgCalculatePlanet(struct OrbElements planet,
 
 
 /* $Log$
-/* Revision 1.1  1998/01/07 03:16:18  curt
-/* Moved from .../Src/Scenery/ to .../Src/Astro/
+/* Revision 1.2  1998/01/22 02:59:28  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.1  1998/01/07 03:16:18  curt
+ * Moved from .../Src/Scenery/ to .../Src/Astro/
+ *
  * Revision 1.3  1997/12/30 16:36:53  curt
  * Merged in Durk's changes ...
  *

diff --git a/Astro/sky.h b/Astro/sky.h
index 0479a4b96c186ca87c1da9d20c08fd308ce573af..7e1275ddc9a081986f0d2fb44ab0d68146a3838e 100644 (file)
--- a/Astro/sky.h
+++ b/Astro/sky.h
@@ -24,6 +24,10 @@
  **************************************************************************/
 
 
+#ifndef _SKY_H
+#define _SKY_H
+
+
 /* (Re)generate the display list */
 void fgSkyInit( void );
 
@@ -34,11 +38,17 @@ void fgSkyColorsInit( void );
 void fgSkyRender( void );
 
 
+#endif /* _SKY_H */
+
+
 /* $Log$
-/* Revision 1.2  1998/01/19 18:40:17  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.3  1998/01/22 02:59:28  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.2  1998/01/19 18:40:17  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.1  1998/01/07 03:16:19  curt
  * Moved from .../Src/Scenery/ to .../Src/Astro/
  *

diff --git a/Astro/stars.h b/Astro/stars.h
index b08ffda9502d86cb44cc27a53d9c514dc8c672bf..e510f7b56236c1b811ea8563faec5d9ba9ef205c 100644 (file)
--- a/Astro/stars.h
+++ b/Astro/stars.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef STARS_H
-#define STARS_H
+#ifndef _STARS_H
+#define _STARS_H
 
 
 #define FG_MAX_STARS 500
@@ -40,14 +40,17 @@ void fgStarsRender( void );
 extern struct OrbElements pltOrbElements[9];
 extern struct fgTIME cur_time_params;
 
-#endif /* STARS_H */
+#endif /* _STARS_H */
 
 
 /* $Log$
-/* Revision 1.2  1998/01/19 18:40:18  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.3  1998/01/22 02:59:28  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.2  1998/01/19 18:40:18  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.1  1998/01/07 03:16:20  curt
  * Moved from .../Src/Scenery/ to .../Src/Astro/
  *

diff --git a/Astro/sun.h b/Astro/sun.h
index 9683462cc0bd7c8cd9c742cbfd332125a2fbcd29..4f4a7be3a3e8799ea35b4312070c7ee41af287f6 100644 (file)
--- a/Astro/sun.h
+++ b/Astro/sun.h
@@ -23,8 +23,8 @@
  **************************************************************************/
 
 
-#ifndef SUN_H
-#define SUN_H
+#ifndef _SUN_H
+#define _SUN_H
 
 
 struct SunPos fgCalcSunPos(struct OrbElements sunParams);
@@ -37,14 +37,17 @@ void fgSunInit( void );
 void fgSunRender( void );
 
 
-#endif /* SUN_H */
+#endif /* _SUN_H */
 
 
 /* $Log$
-/* Revision 1.2  1998/01/19 18:40:19  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.3  1998/01/22 02:59:29  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.2  1998/01/19 18:40:19  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.1  1998/01/07 03:16:21  curt
  * Moved from .../Src/Scenery/ to .../Src/Astro/
  *