John Ellson:

Changes require to compile with a Fedora-Core Development system running
on an X86_64 platform with gcc-4.1.0.

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index 310ba7d722c58a7d75c6f291be0ce2a9060db6dd..e4f7ac964942458511a3378d8b0465f6ee6bd0df 100644 (file)
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -703,6 +703,16 @@ FGMetarEnvironmentCtrl::update_metar_properties( const FGMetar *m )
 
 
 #if defined(ENABLE_THREADS)
+/**
+ * Ensure mutex is unlocked.
+ */
+void
+metar_cleanup_handler( void* arg )
+{
+    FGMetarEnvironmentCtrl* fetcher = (FGMetarEnvironmentCtrl*) arg;
+    fetcher->mutex.unlock();
+}
+
 /**
  *
  */
@@ -724,16 +734,6 @@ FGMetarEnvironmentCtrl::MetarThread::run()
     }
     pthread_cleanup_pop(1);
 }
-
-/**
- * Ensure mutex is unlocked.
- */
-void
-metar_cleanup_handler( void* arg )
-{
-    FGMetarEnvironmentCtrl* fetcher = (FGMetarEnvironmentCtrl*) arg;
-    fetcher->mutex.unlock();
-}
 #endif // ENABLE_THREADS
 
 

diff --git a/src/Environment/fgclouds.hxx b/src/Environment/fgclouds.hxx
index ae555b3631481e30f33554b8270d7685d86e9b0b..519f229c5d34ab8561dda8fd97ba64f040f449c9 100644 (file)
--- a/src/Environment/fgclouds.hxx
+++ b/src/Environment/fgclouds.hxx
@@ -53,7 +53,7 @@ private:
 
        void update_metar_properties( const FGMetar *m );
 
-       void FGClouds::update_env_config ();
+       void update_env_config ();
 
        int update_event;
        SGSoundSample *snd_lightning;

diff --git a/src/Scenery/FGTileLoader.cxx b/src/Scenery/FGTileLoader.cxx
index ca61e8294943acfd1343ddf956654364d751f214..fa12871e8919422e8610b5010f18a1bf288d6247 100644 (file)
--- a/src/Scenery/FGTileLoader.cxx
+++ b/src/Scenery/FGTileLoader.cxx
@@ -156,6 +156,16 @@ FGTileLoader::update()
 
 
 #if defined(ENABLE_THREADS)
+/**
+ * Ensure mutex is unlocked.
+ */
+void 
+cleanup_handler( void* arg )
+{
+    FGTileLoader* loader = (FGTileLoader*) arg;
+    loader->mutex.unlock();
+}
+
 /**
  * 
  */
@@ -192,14 +202,4 @@ FGTileLoader::LoaderThread::run()
     }
     pthread_cleanup_pop(1);
 }
-
-/**
- * Ensure mutex is unlocked.
- */
-void 
-cleanup_handler( void* arg )
-{
-    FGTileLoader* loader = (FGTileLoader*) arg;
-    loader->mutex.unlock();
-}
 #endif // ENABLE_THREADS

diff --git a/src/Traffic/SchedFlight.hxx b/src/Traffic/SchedFlight.hxx
index b6541bd46469dae1ce9b8b49a5d674fce25ba959..504ed51d45e6b78e83746c08f10cc25e4f93ba28 100644 (file)
--- a/src/Traffic/SchedFlight.hxx
+++ b/src/Traffic/SchedFlight.hxx
@@ -67,7 +67,7 @@ public:
   FGScheduledFlight();
   FGScheduledFlight(const FGScheduledFlight &other);
   //  FGScheduledFlight(const string);
-  FGScheduledFlight::FGScheduledFlight(const string& cs,
+  FGScheduledFlight(const string& cs,
                     const string& fr,
                     const string& depPrt,
                     const string& arrPrt,