From: curt <curt>
Date: Thu, 22 Jan 1998 02:59:23 +0000 (+0000)
Subject: Changed #ifdef FILE_H to #ifdef _FILE_H
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=38264efc4dd47d5ce3a76a1bf8d003f4b99dcb4c;p=flightgear.git

Changed #ifdef FILE_H to #ifdef _FILE_H
---

diff --git a/Aircraft/aircraft.h b/Aircraft/aircraft.h
index 96e4c576f..b0b8ff3c1 100644
--- a/Aircraft/aircraft.h
+++ b/Aircraft/aircraft.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef AIRCRAFT_H
-#define AIRCRAFT_H
+#ifndef _AIRCRAFT_H
+#define _AIRCRAFT_H
 
 #include <Flight/flight.h>
 #include <Controls/controls.h>
@@ -47,14 +47,29 @@ extern struct fgAIRCRAFT current_aircraft;
 void fgAircraftOutputCurrent(struct fgAIRCRAFT *a);
 
 
-#endif /* AIRCRAFT_H */
+#endif /* _AIRCRAFT_H */
 
 
 /* $Log$
-/* Revision 1.8  1998/01/19 19:26:57  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.9  1998/01/22 02:59:23  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.8  1998/01/19 19:26:57  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
+ * Revision 1.7  1997/12/10 22:37:38  curt
+ * Prepended "fg"AIRCRAFT_H */
+
+
+/* $Log$
+/* Revision 1.9  1998/01/22 02:59:23  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
+/*
+ * Revision 1.8  1998/01/19 19:26:57  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.7  1997/12/10 22:37:38  curt
  * Prepended "fg" on the name of all global structures that didn't have it yet.
  * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
diff --git a/Astro/moon.h b/Astro/moon.h
index b81d98183..b5f803e06 100644
--- 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 5ce2ae940..432dfc7dd 100644
--- 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 daf99dc27..d9ceb9dec 100644
--- 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 6cf874896..d5f10b903 100644
--- 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 0479a4b96..7e1275ddc 100644
--- 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 b08ffda95..e510f7b56 100644
--- 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 9683462cc..4f4a7be3a 100644
--- 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/
  *
diff --git a/Cockpit/cockpit.h b/Cockpit/cockpit.h
index a70d4a7a8..6de1d0ca1 100644
--- a/Cockpit/cockpit.h
+++ b/Cockpit/cockpit.h
@@ -24,6 +24,10 @@
  **************************************************************************/
  
 
+#ifndef _COCKPIT_H
+#define _COCKPIT_H
+
+
 #include <Cockpit/hud.h>
 
 
@@ -42,11 +46,17 @@ struct fgCOCKPIT *fgCockpitInit( struct fgAIRCRAFT cur_aircraft );
 void fgCockpitUpdate( void );
 
 
+#endif /* _COCKPIT_H */
+
+
 /* $Log$
-/* Revision 1.4  1998/01/19 19:27:01  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.5  1998/01/22 02:59:29  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.4  1998/01/19 19:27:01  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.3  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.
diff --git a/Cockpit/hud.h b/Cockpit/hud.h
index 1425c74f9..012ab5842 100644
--- a/Cockpit/hud.h
+++ b/Cockpit/hud.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef HUD_H
-#define HUD_H
+#ifndef _HUD_H
+#define _HUD_H
 
 
 #include <Aircraft/aircraft.h>
@@ -229,14 +229,17 @@ void fgUpdateHUD( Hptr hud );
 void fgUpdateHUD2( struct HUD *hud );
 
 
-#endif /* HUD_H */
+#endif /* _HUD_H */
 
 
 /* $Log$
-/* Revision 1.5  1998/01/19 19:27:01  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.6  1998/01/22 02:59:30  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.5  1998/01/19 19:27:01  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.4  1998/01/19 18:40:21  curt
  * Tons of little changes to clean up the code and to remove fatal errors
  * when building with the c++ compiler.
diff --git a/Controls/controls.h b/Controls/controls.h
index d9f6ec5d1..333c59913 100644
--- a/Controls/controls.h
+++ b/Controls/controls.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef CONTROLS_H
-#define CONTROLS_H
+#ifndef _CONTROLS_H
+#define _CONTROLS_H
 
 
 #include "../Include/limits.h"
@@ -76,15 +76,17 @@ void fgThrottleMove(int engine, double amt);
 void fgThrottleSet(int engine, double pos);
 
 
-
-#endif /* CONTROLS_H */
+#endif /* _CONTROLS_H */
 
 
 /* $Log$
-/* Revision 1.8  1998/01/19 18:40:22  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.9  1998/01/22 02:59:31  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.8  1998/01/19 18:40:22  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.7  1997/12/15 23:54:36  curt
  * Add xgl wrappers for debugging.
  * Generate terrain normals on the fly.
diff --git a/FDM/flight.h b/FDM/flight.h
index 6e15911b4..20b002623 100644
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef FLIGHT_H
-#define FLIGHT_H
+#ifndef _FLIGHT_H
+#define _FLIGHT_H
 
 
 #include <Flight/Slew/slew.h>
@@ -392,14 +392,17 @@ int fgFlightModelInit(int model, struct fgFLIGHT *f, double dt);
 int fgFlightModelUpdate(int model, struct fgFLIGHT *f, int multiloop);
 
 
-#endif /* FLIGHT_H */
+#endif /* _FLIGHT_H */
 
 
 /* $Log$
-/* Revision 1.11  1998/01/19 19:27:03  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.12  1998/01/22 02:59:32  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.11  1998/01/19 19:27:03  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.10  1997/12/10 22:37:43  curt
  * Prepended "fg" on the name of all global structures that didn't have it yet.
  * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
diff --git a/Joystick/joystick.h b/Joystick/joystick.h
index f363ead6b..3c9d0c6ed 100644
--- a/Joystick/joystick.h
+++ b/Joystick/joystick.h
@@ -24,12 +24,22 @@
  **************************************************************************/
 
 
+#ifndef _JOYSTICK_H
+#define _JOYSTICK_H
+
+
 int fgJoystickInit( int joy_num );
 int fgJoystickRead( double *joy_x, double *joy_y, int *joy_b1, int *joy_b2 );
 
 
+#endif /* _JOYSTICK_H */
+
+
 /* $Log$
-/* Revision 1.1  1997/08/29 18:06:55  curt
-/* Initial revision.
+/* Revision 1.2  1998/01/22 02:59:36  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.1  1997/08/29 18:06:55  curt
+ * Initial revision.
+ *
  */
diff --git a/LaRCsim/ls_cockpit.h b/LaRCsim/ls_cockpit.h
index 4680881d8..f24047243 100644
--- a/LaRCsim/ls_cockpit.h
+++ b/LaRCsim/ls_cockpit.h
@@ -35,6 +35,9 @@
 
 $Header$
 $Log$
+Revision 1.3  1998/01/22 02:59:32  curt
+Changed #ifdef FILE_H to #ifdef _FILE_H
+
 Revision 1.2  1997/05/31 19:16:27  curt
 Elevator trim added.
 
@@ -54,6 +57,11 @@ Initial Flight Gear revision.
 
 --------------------------------------------------------------------------*/
 
+
+#ifndef _LS_COCKPIT_H
+#define _LS_COCKPIT_H
+
+
 typedef struct {
     float   long_stick, lat_stick, rudder_pedal;
     float   long_trim;
@@ -83,3 +91,6 @@ extern COCKPIT cockpit_;
 #define SB_extend	cockpit_.sb_extend
 #define SB_retract	cockpit_.sb_retract
 #define Gear_sel_up	cockpit_.gear_sel_up
+
+
+#endif /* _LS_COCKPIT_H */
diff --git a/LaRCsim/ls_constants.h b/LaRCsim/ls_constants.h
index bdd123d86..2393f4c5d 100644
--- a/LaRCsim/ls_constants.h
+++ b/LaRCsim/ls_constants.h
@@ -65,6 +65,10 @@
 
 --------------------------------------------------------------------------*/
 
+#ifndef _LS_CONSTANTS
+#define _LS_CONSTANTS
+
+
 #ifndef CONSTANTS
 
 #define CONSTANTS -1
@@ -122,4 +126,8 @@
 
 #endif
 
+
+#endif /* _LS_CONSTANTS_H */
+
+
 /*------------------------- end of ls_constants.h -------------------------*/
diff --git a/LaRCsim/ls_generic.h b/LaRCsim/ls_generic.h
index a996aef4a..02cdaf210 100644
--- a/LaRCsim/ls_generic.h
+++ b/LaRCsim/ls_generic.h
@@ -66,6 +66,11 @@
 
 --------------------------------------------------------------------------*/
 
+
+#ifndef _LS_GENERIC_H
+#define _LS_GENERIC_H
+
+
 typedef struct {
 
 /*================== Mass properties and geometry values ==================*/
@@ -401,4 +406,8 @@ typedef struct {
 
 extern GENERIC generic_;	/* usually defined in ls_main.c */
 
+
+#endif /* _LS_GENERIC_H */
+
+
 /*---------------------------  end of ls_generic.h  ------------------------*/
diff --git a/LaRCsim/ls_sim_control.h b/LaRCsim/ls_sim_control.h
index c37f559f5..4cae282c4 100644
--- a/LaRCsim/ls_sim_control.h
+++ b/LaRCsim/ls_sim_control.h
@@ -40,6 +40,9 @@
 
 $Header$
 $Log$
+Revision 1.3  1998/01/22 02:59:33  curt
+Changed #ifdef FILE_H to #ifdef _FILE_H
+
 Revision 1.2  1998/01/06 01:20:17  curt
 Tweaks to help building with MSVC++
 
@@ -67,6 +70,12 @@ Initial Flight Gear revision.
 		
 
 --------------------------------------------------------------------------*/
+
+
+#ifndef _LS_SIM_CONTROL_H
+#define _LS_SIM_CONTROL_H
+
+
 #include <stdio.h>
 
 #ifndef SIM_CONTROL
@@ -113,4 +122,8 @@ extern SIM_CONTROL sim_control_;
 
 #endif
 
+
+#endif /* _LS_SIM_CONTROL_H */
+
+
 /*------------------------  end of ls_sim_control.h ----------------------*/
diff --git a/LaRCsim/ls_sym.h b/LaRCsim/ls_sym.h
index a5c53b12e..4f032720c 100644
--- a/LaRCsim/ls_sym.h
+++ b/LaRCsim/ls_sym.h
@@ -40,6 +40,9 @@
 
 $Header$
 $Log$
+Revision 1.2  1998/01/22 02:59:34  curt
+Changed #ifdef FILE_H to #ifdef _FILE_H
+
 Revision 1.1  1997/05/29 00:10:00  curt
 Initial Flight Gear revision.
 
@@ -81,6 +84,10 @@ Initial Flight Gear revision.
 
 --------------------------------------------------------------------------*/
 
+#ifndef _LS_SYM_H
+#define _LS_SYM_H
+
+
 /* Return codes */
 
 #define SYM_NOT_LOADED -2
@@ -151,5 +158,6 @@ extern void 	ls_set_sym_val( symbol_rec *symrec, double value );
 	   and error message is printed on stderr.			*/
 
 
+#endif /* _LS_SYM_H */
 
 
diff --git a/Main/GLUTkey.h b/Main/GLUTkey.h
index 3b867ae0c..671eabece 100644
--- a/Main/GLUTkey.h
+++ b/Main/GLUTkey.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef GLUTKEY_H
-#define GLUTKEY_H
+#ifndef _GLUTKEY_H
+#define _GLUTKEY_H
 
 
 #ifdef GLUT
@@ -40,13 +40,16 @@ void GLUTkey(unsigned char k, int x, int y);
 void GLUTspecialkey(int k, int x, int y);
 
 
-#endif /* GLUTKEY_H */
+#endif /* _GLUTKEY_H */
 
 
 /* $Log$
-/* Revision 1.5  1997/07/23 21:52:23  curt
-/* Put comments around the text after an #endif for increased portability.
+/* Revision 1.6  1998/01/22 02:59:36  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.5  1997/07/23 21:52:23  curt
+ * Put comments around the text after an #endif for increased portability.
+ *
  * Revision 1.4  1997/06/02 03:40:06  curt
  * A tiny bit more view tweaking.
  *
diff --git a/Main/Makefile b/Main/Makefile
index ca3eb0b81..e9cc61b8a 100644
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -29,14 +29,13 @@ CFILES = fg_init.c views.c $(INTERFACE_FILES)
 
 FGLIBS = -lAircraft -lAstro -lCockpit -lControls -lFlight \
 	-lJoystick -lLaRCsim -lSlew -lScenery -lTime -lWeather -lMath \
-	-lc \
 	$(NULL)
 
 
 LCDEFS = -DGLUT
 LLDFLAGS =
 LDLIBS = $(FGLIBS) $(FG_DEBUG_LIBS) \
-	$(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
+	$(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm
 
 include $(FG_ROOT_SRC)/commondefs
 
@@ -52,6 +51,9 @@ include $(COMMONRULES)
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.43  1998/01/22 02:59:37  curt
+# Changed #ifdef FILE_H to #ifdef _FILE_H
+#
 # Revision 1.42  1998/01/21 21:11:34  curt
 # Misc. tweaks.
 #
diff --git a/Main/fg_init.c b/Main/fg_init.c
index 1d6ddd3b1..9b95510bb 100644
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -113,25 +113,20 @@ void fgInitSubsystems( void ) {
     /* Initial Position at (P13) GLOBE airport */
     FG_Longitude = ( -398391.28 / 3600.0 ) * DEG_TO_RAD;
     FG_Latitude  = (  120070.41 / 3600.0 ) * DEG_TO_RAD;
+    FG_Runway_altitude = (3234.5 + 300);
     FG_Altitude = FG_Runway_altitude + 3.758099;
     
     /* Initial Position at (SEZ) SEDONA airport */
-    /* FG_Longitude = -111.774176 * DEG_TO_RAD; */
-    /* FG_Latitude  = 34.834343 * DEG_TO_RAD; */
-    /* FG_Runway_altitude = 4827; */
+    /* FG_Longitude = (-111.7884614 + 0.02) * DEG_TO_RAD; */
+    /* FG_Latitude  = (  34.8486289 - 0.04) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = (4827 + 800); */
     /* FG_Altitude = FG_Runway_altitude + 3.758099; */
-    
-    /* Initial Position SE of (SEZ) SEDONA airport */
-    /* FG_Longitude = -111.724176 * DEG_TO_RAD; */
-    /* FG_Latitude  = 34.744343 * DEG_TO_RAD; */
-    /* FG_Runway_altitude = 7427; */
-    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
-    
+        
     /* Initial Position at (HSP) Hot Springs, VA */
-    FG_Longitude = (-79.8338964 /*+ 0.02*/) * DEG_TO_RAD;
-    FG_Latitude  = ( 37.9514564 /*+ 0.05*/) * DEG_TO_RAD;
-    FG_Runway_altitude = (792 /*+ 1500*/);
-    FG_Altitude = FG_Runway_altitude + 3.758099;
+    /* FG_Longitude = (-79.8338964 + 0.02) * DEG_TO_RAD; */
+    /* FG_Latitude  = ( 37.9514564 + 0.05) * DEG_TO_RAD; */
+    /* FG_Runway_altitude = (792 + 1500); */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
     
     /* Initial Position at (ANE) Anoka County airport */
     /* FG_Longitude = -93.2113889 * DEG_TO_RAD; */
@@ -140,7 +135,7 @@ void fgInitSubsystems( void ) {
     /* FG_Altitude = FG_Runway_altitude + 3.758099; */
     
     /* Initial Position north of the city of Globe */
-    /* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
+    /* FGto do the install_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  120625.64 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Longitude = ( -397867.44 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = (  119548.21 / 3600.0 ) * DEG_TO_RAD; */
@@ -161,8 +156,7 @@ void fgInitSubsystems( void ) {
     /* FG_Longitude = ( 88128.00 / 3600.0 ) * DEG_TO_RAD; */
     /* FG_Latitude  = ( 93312.00 / 3600.0 ) * DEG_TO_RAD; */
 
- 
-    printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
+     printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
 	   FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, 
 	   FG_Altitude * FEET_TO_METER);
 
@@ -299,9 +293,12 @@ void fgInitSubsystems( void ) {
 
 
 /* $Log$
-/* Revision 1.33  1998/01/21 21:11:34  curt
-/* Misc. tweaks.
+/* Revision 1.34  1998/01/22 02:59:37  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.33  1998/01/21 21:11:34  curt
+ * Misc. tweaks.
+ *
  * Revision 1.32  1998/01/19 19:27:08  curt
  * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
  * This should simplify things tremendously.
diff --git a/Main/fg_init.h b/Main/fg_init.h
index 4b4372be2..46c8d9b93 100644
--- a/Main/fg_init.h
+++ b/Main/fg_init.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef FG_INIT_H
-#define FG_INIT_H
+#ifndef _FG_INIT_H
+#define _FG_INIT_H
 
 
 /* General house keeping initializations */
@@ -37,11 +37,14 @@ void fgInitGeneral( void );
 void fgInitSubsystems( void );
 
 
-#endif /* FG_INIT_H */
+#endif /* _FG_INIT_H */
 
 
 /* $Log$
-/* Revision 1.1  1997/08/23 01:46:20  curt
-/* Initial revision.
+/* Revision 1.2  1998/01/22 02:59:38  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.1  1997/08/23 01:46:20  curt
+ * Initial revision.
+ *
  */
diff --git a/Main/views.h b/Main/views.h
index f74a986c3..04dde7901 100644
--- a/Main/views.h
+++ b/Main/views.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef VIEWS_H
-#define VIEWS_H
+#ifndef _VIEWS_H
+#define _VIEWS_H
 
 
 #include <Include/types.h>
@@ -85,14 +85,17 @@ void fgViewInit(struct fgVIEW *v);
 void fgViewUpdate(struct fgFLIGHT *f, struct fgVIEW *v, struct fgLIGHT *l);
 
 
-#endif /* VIEWS_H */
+#endif /* _VIEWS_H */
 
 
 /* $Log$
-/* Revision 1.6  1998/01/19 19:27:10  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.7  1998/01/22 02:59:38  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.6  1998/01/19 19:27:10  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.5  1997/12/22 04:14:32  curt
  * Aligned sky with sun so dusk/dawn effects can be correct relative to the sun.
  *
diff --git a/Scenery/Makefile b/Scenery/Makefile
index cd0787ec0..87786dc63 100644
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -23,10 +23,12 @@
 # (Log is kept at end of this file)
 #---------------------------------------------------------------------------
 
+
 ARLIBRARY = libScenery.a
 TARGETS = $(ARLIBRARY)
 
-CFILES = common.c geometry.c mesh.c obj.c scenery.c tilemgr.c tileutils.c
+CFILES = common.c geometry.c mesh.c obj.c scenery.c texload.c \
+	tilemgr.c tileutils.c
 CXXFILES = 
 
 LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
diff --git a/Scenery/common.h b/Scenery/common.h
index 0273d214d..d7d7639b4 100644
--- a/Scenery/common.h
+++ b/Scenery/common.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef _COMMON_H
+#define _COMMON_H
 
 
 /* Maximum length for an identifier */
@@ -36,13 +36,16 @@
 char *strip_quotes(char *s);
 
 
-#endif /* COMMON_H */
+#endif /* _COMMON_H */
 
 
 /* $Log$
-/* Revision 1.3  1997/07/23 21:52:24  curt
-/* Put comments around the text after an #endif for increased portability.
+/* Revision 1.4  1998/01/22 02:59:40  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.3  1997/07/23 21:52:24  curt
+ * Put comments around the text after an #endif for increased portability.
+ *
  * Revision 1.2  1997/05/23 15:40:41  curt
  * Added GNU copyright headers.
  *
diff --git a/Scenery/geometry.h b/Scenery/geometry.h
index 28de28c8c..f62a22f87 100644
--- a/Scenery/geometry.h
+++ b/Scenery/geometry.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef GEOMETRY_H
-#define GEOMETRY_H
+#ifndef _GEOMETRY_H
+#define _GEOMETRY_H
 
 
 #define VRML_BOX       0
@@ -52,14 +52,17 @@ void vrmlHandleGeometry( void );
 int vrmlFreeGeometry( void );
 
 
-#endif /* GEOMETRY_H */
+#endif /* _GEOMETRY_H */
 
 
 /* $Log$
-/* Revision 1.3  1998/01/19 18:40:36  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.4  1998/01/22 02:59:40  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.3  1998/01/19 18:40:36  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.2  1997/07/23 21:52:25  curt
  * Put comments around the text after an #endif for increased portability.
  *
diff --git a/Scenery/mesh.h b/Scenery/mesh.h
index fe67be4d8..e08c539e2 100644
--- a/Scenery/mesh.h
+++ b/Scenery/mesh.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef MESH_H
-#define MESH_H
+#ifndef _MESH_H
+#define _MESH_H
 
 
 #include <GL/glut.h>
@@ -78,14 +78,17 @@ double mesh_altitude(double lon, double lat);
 GLint mesh_to_OpenGL(struct MESH *m);
 
 
-#endif /* MESH_H */
+#endif /* _MESH_H */
 
 
 /* $Log$
-/* Revision 1.8  1998/01/19 18:40:37  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.9  1998/01/22 02:59:41  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.8  1998/01/19 18:40:37  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.7  1997/08/27 03:30:29  curt
  * Changed naming scheme of basic shared structures.
  *
diff --git a/Scenery/obj.h b/Scenery/obj.h
index 02ed97534..7c10cd749 100644
--- a/Scenery/obj.h
+++ b/Scenery/obj.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef OBJ_H
-#define OBJ_H
+#ifndef _OBJ_H
+#define _OBJ_H
 
 
 #ifdef WIN32
@@ -41,14 +41,17 @@
 GLint fgObjLoad(char *file, struct fgCartesianPoint *ref);
 
 
-#endif /* OBJ_H */
+#endif /* _OBJ_H */
 
 
 /* $Log$
-/* Revision 1.3  1998/01/19 19:27:17  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:41  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.3  1998/01/19 19:27:17  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.2  1998/01/13 00:23:10  curt
  * Initial changes to support loading and management of scenery tiles.  Note,
  * there's still a fair amount of work left to be done.
diff --git a/Scenery/scenery.h b/Scenery/scenery.h
index b47b27cfd..3ff1ab729 100644
--- a/Scenery/scenery.h
+++ b/Scenery/scenery.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef SCENERY_H
-#define SCENERY_H
+#ifndef _SCENERY_H
+#define _SCENERY_H
 
 
 #include <Include/types.h>
@@ -59,14 +59,17 @@ void fgSceneryUpdate(double lon, double lat, double elev);
 void fgSceneryRender( void );
 
 
-#endif /* SCENERY_H */
+#endif /* _SCENERY_H */
 
 
 /* $Log$
-/* Revision 1.14  1998/01/19 19:27:17  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.15  1998/01/22 02:59:41  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.14  1998/01/19 19:27:17  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.13  1998/01/19 18:40:38  curt
  * Tons of little changes to clean up the code and to remove fatal errors
  * when building with the c++ compiler.
diff --git a/Scenery/tilemgr.h b/Scenery/tilemgr.h
index c43db6f08..d61146846 100644
--- a/Scenery/tilemgr.h
+++ b/Scenery/tilemgr.h
@@ -24,6 +24,10 @@
  **************************************************************************/
 
 
+#ifndef _TILEMGR_H
+#define _TILEMGR_H
+
+
 /* Initialize the Tile Manager subsystem */
 void fgTileMgrInit( void );
 
@@ -37,11 +41,17 @@ void fgTileMgrUpdate( void );
 void fgTileMgrRender( void );
 
 
+#endif /* _TILEMGR_H */
+
+
 /* $Log$
-/* Revision 1.3  1998/01/19 18:40:38  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.4  1998/01/22 02:59:42  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.3  1998/01/19 18:40:38  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.2  1998/01/13 00:23:11  curt
  * Initial changes to support loading and management of scenery tiles.  Note,
  * there's still a fair amount of work left to be done.
diff --git a/Scenery/tileutils.h b/Scenery/tileutils.h
index 29ea5940a..0031845c4 100644
--- a/Scenery/tileutils.h
+++ b/Scenery/tileutils.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef TILEUTILS_H
-#define TILEUTILS_H
+#ifndef _TILEUTILS_H
+#define _TILEUTILS_H
 
 
 struct bucket {
@@ -73,13 +73,16 @@ void gen_idx_array(struct bucket *p1, struct bucket *tiles,
 			  int width, int height);
 
 
-#endif /* TILEUTILS_H */
+#endif /* _TILEUTILS_H */
 
 
 /* $Log$
-/* Revision 1.5  1998/01/14 02:19:05  curt
-/* Makde offset_bucket visible to outside.
+/* Revision 1.6  1998/01/22 02:59:42  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.5  1998/01/14 02:19:05  curt
+ * Makde offset_bucket visible to outside.
+ *
  * Revision 1.4  1998/01/13 00:23:12  curt
  * Initial changes to support loading and management of scenery tiles.  Note,
  * there's still a fair amount of work left to be done.
diff --git a/Slew/slew.h b/Slew/slew.h
index 57e572aa1..7f4606dc7 100644
--- a/Slew/slew.h
+++ b/Slew/slew.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef SLEW_H
-#define SLEW_H
+#ifndef _SLEW_H
+#define _SLEW_H
 
 
 /* reset flight params to a specific position */ 
@@ -35,14 +35,17 @@ void fgSlewInit(double pos_x, double pos_y, double pos_z, double heading);
 void fgSlewUpdate( void );
 
 
-#endif /* SLEW_H */
+#endif /* _SLEW_H */
 
 
 /* $Log$
-/* Revision 1.3  1998/01/19 18:40:30  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.4  1998/01/22 02:59:34  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.3  1998/01/19 18:40:30  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.2  1997/07/23 21:52:20  curt
  * Put comments around the text after an #endif for increased portability.
  *
diff --git a/Time/event.h b/Time/event.h
index 88033c1f9..6532878c0 100644
--- a/Time/event.h
+++ b/Time/event.h
@@ -24,6 +24,10 @@
  **************************************************************************/
 
 
+#ifndef _EVENT_H
+#define _EVENT_H
+
+
 #define FG_EVENT_SUSP 0
 #define FG_EVENT_READY 1
 #define FG_EVENT_QUEUED 2
@@ -57,11 +61,17 @@ void fgEventPrintStats( void );
 void fgEventProcess( void );
 
 
+#endif /* _EVENT_H */
+
+
 /* $Log$
-/* Revision 1.2  1998/01/19 18:40:39  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:43  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.2  1998/01/19 18:40:39  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.1  1997/12/30 04:19:22  curt
  * Initial revision.
  *
diff --git a/Time/fg_time.h b/Time/fg_time.h
index 226efa92b..6e39cdb39 100644
--- a/Time/fg_time.h
+++ b/Time/fg_time.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef FG_TIME_H
-#define FG_TIME_H
+#ifndef _FG_TIME_H
+#define _FG_TIME_H
 
 
 #ifdef WIN32
@@ -95,14 +95,17 @@ void fgTimeInit(struct fgTIME *t);
 void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t);
 
 
-#endif /* FG_TIME_H */
+#endif /* _FG_TIME_H */
 
 
 /* $Log$
-/* Revision 1.13  1998/01/19 19:27:20  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.14  1998/01/22 02:59:43  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.13  1998/01/19 19:27:20  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.12  1998/01/05 18:44:37  curt
  * Add an option to advance/decrease time from keyboard.
  *
diff --git a/Time/fg_timer.h b/Time/fg_timer.h
index e6bd25e84..7d1e4ef20 100644
--- a/Time/fg_timer.h
+++ b/Time/fg_timer.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef FG_TIMER_H
-#define FG_TIMER_H
+#ifndef _FG_TIMER_H
+#define _FG_TIMER_H
 
 
 extern unsigned long int fgSimTime;
@@ -40,14 +40,17 @@ void fgTimerInit( float dt, void (*f)( void ) );
 int fgGetTimeInterval( void );
 
 
-#endif /* FG_TIMER_H */
+#endif /* _FG_TIMER_H */
 
 
 /* $Log$
-/* Revision 1.3  1998/01/19 18:40:40  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.4  1998/01/22 02:59:43  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.3  1998/01/19 18:40:40  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.2  1997/07/23 21:52:27  curt
  * Put comments around the text after an #endif for increased portability.
  *
diff --git a/Time/sunpos.h b/Time/sunpos.h
index 81dd125a8..2c16b06e8 100644
--- a/Time/sunpos.h
+++ b/Time/sunpos.h
@@ -36,8 +36,8 @@
  */
 
 
-#ifndef SUNPOS_H
-#define SUNPOS_H
+#ifndef _SUNPOS_H
+#define _SUNPOS_H
 
 
 #include <time.h>
@@ -50,4 +50,4 @@ void fgUpdateSunPos( void );
 void fgSunPosition(time_t ssue, double *lon, double *lat);
 
 
-#endif /* SUNPOS_H */
+#endif /* _SUNPOS_H */
diff --git a/Weather/weather.h b/Weather/weather.h
index a6684ec34..21fc749be 100644
--- a/Weather/weather.h
+++ b/Weather/weather.h
@@ -24,8 +24,8 @@
  **************************************************************************/
 
 
-#ifndef WEATHER_H
-#define WEATHER_H
+#ifndef _WEATHER_H
+#define _WEATHER_H
 
 
 /* holds the current weather values */
@@ -43,14 +43,17 @@ void fgWeatherInit( void );
 void fgWeatherUpdate( void );
 
 
-#endif /* WEATHER_H */
+#endif /* _WEATHER_H */
 
 
 /* $Log$
-/* Revision 1.7  1998/01/19 18:40:41  curt
-/* Tons of little changes to clean up the code and to remove fatal errors
-/* when building with the c++ compiler.
+/* Revision 1.8  1998/01/22 02:59:44  curt
+/* Changed #ifdef FILE_H to #ifdef _FILE_H
 /*
+ * Revision 1.7  1998/01/19 18:40:41  curt
+ * Tons of little changes to clean up the code and to remove fatal errors
+ * when building with the c++ compiler.
+ *
  * Revision 1.6  1997/12/30 22:22:47  curt
  * Further integration of event manager.
  *