From dbcfeaf7663a65385c38bcf447d57ebacb6108b7 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 8 Sep 1998 21:40:08 +0000
Subject: [PATCH] Fixes by Charlie Hotchkiss.

---
 Main/fg_init.cxx | 11 +++++++----
 Main/options.hxx | 18 ++++++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx
index 55e58587f..ec3dea84e 100644
--- a/Main/fg_init.cxx
+++ b/Main/fg_init.cxx
@@ -37,7 +37,6 @@
 #  define _G_NO_EXTERN_TEMPLATES
 #endif
 
-#include <string.h>
 #include <string>
 
 #include <Include/fg_constants.h>
@@ -113,7 +112,7 @@ int fgInitPosition( void ) {
     FG_Altitude = current_options.get_altitude() * METER_TO_FEET;
     FG_Runway_altitude = FG_Altitude - 3.758099;
 
-    fgPrintf( FG_GENERAL, FG_INFO, 
+    fgPrintf( FG_GENERAL, FG_INFO,
 	      "Initial position is: (%.4f, %.4f, %.2f)\n", 
 	      FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, 
 	      FG_Altitude * FEET_TO_METER);
@@ -138,7 +137,7 @@ int fgInitGeneral( void ) {
     g->glVersion = (char *)glGetString ( GL_VERSION );
 
     root = current_options.get_fg_root();
-    if ( ! root.length() ) { 
+    if ( ! root.length() ) {
 	// No root path set? Then bail ...
 	fgPrintf( FG_GENERAL, FG_EXIT, "%s %s\n",
 		  "Cannot continue without environment variable FG_ROOT",
@@ -186,7 +185,8 @@ fgPoint3d geod_to_cart(double geod[3]) {
 // initialization routines.  If you are adding a subsystem to flight
 // gear, its initialization call should located in this routine.
 // Returns non-zero if a problem encountered.
-int fgInitSubsystems( void ) {
+int fgInitSubsystems( void )
+{
     fgFLIGHT *f;
     fgLIGHT *l;
     fgTIME *t;
@@ -392,6 +392,9 @@ int fgInitSubsystems( void ) {
 
 
 // $Log$
+// Revision 1.36  1998/09/08 21:40:08  curt
+// Fixes by Charlie Hotchkiss.
+//
 // Revision 1.35  1998/08/29 13:09:26  curt
 // Changes to event manager from Bernie Bright.
 //
diff --git a/Main/options.hxx b/Main/options.hxx
index c5afe1a0f..76dc26494 100644
--- a/Main/options.hxx
+++ b/Main/options.hxx
@@ -27,12 +27,19 @@
 #define _OPTIONS_HXX
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
 #endif                                   
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <string>
-#include <string.h>
+
+#ifdef NEEDNAMESPACESTD
+using namespace std;
+#endif
 
 class fgOPTIONS {
 public:
@@ -50,8 +57,8 @@ public:
 	FG_FOG_NICEST   = 2
     };
 
-    const int FG_RADIUS_MIN = 1;
-    const int FG_RADIUS_MAX = 4;
+    static const int FG_RADIUS_MIN = 1;
+    static const int FG_RADIUS_MAX = 4;
 
 private:
 
@@ -175,6 +182,9 @@ extern fgOPTIONS current_options;
 
 
 // $Log$
+// Revision 1.17  1998/09/08 21:40:10  curt
+// Fixes by Charlie Hotchkiss.
+//
 // Revision 1.16  1998/08/27 17:02:08  curt
 // Contributions from Bernie Bright <bbright@c031.aone.net.au>
 // - use strings for fg_root and airport_id and added methods to return