Minor tweaks to work around egcs compiler pickiness.

diff --git a/src/FDM/JSBSim/FGMain.cpp b/src/FDM/JSBSim/FGMain.cpp
index 08413befdd9e72891810c97f8ba624387f43335c..e43f9884a27fc9cce89e63394309a3e7d6b75f62 100644 (file)
--- a/src/FDM/JSBSim/FGMain.cpp
+++ b/src/FDM/JSBSim/FGMain.cpp
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <ctime>
 
-void main(int argc, char** argv)
+int main(int argc, char** argv)
 {
        FGFDMExec* FDMExec;
        

diff --git a/src/Objects/materialmgr.cxx b/src/Objects/materialmgr.cxx
index 73cc8f96e5dd5dcd5cc17245db473901f025b3f9..292ac66e92bec293e440c69b79736b923da58391 100644 (file)
--- a/src/Objects/materialmgr.cxx
+++ b/src/Objects/materialmgr.cxx
@@ -187,7 +187,7 @@ fgMATERIAL_MGR::load_lib ( void )
            state->enable ( GL_CULL_FACE      ) ;
            if ( current_options.get_textures() ) {
                state->enable( GL_TEXTURE_2D );
-               state->setTexture( tex_file.c_str() );
+               state->setTexture( (char *)tex_file.c_str() );
                state->setMaterial ( GL_AMBIENT_AND_DIFFUSE, 1, 1, 1, 1 ) ;
            } else {
                state->disable( GL_TEXTURE_2D );

diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index 38729da3f1fb2f230960eb652d055106abcaf5b0..cab9bbcf1c2a9ddda558c005c2a2b2a12dbd7d5e 100644 (file)
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -159,7 +159,7 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t) {
     ssgSimpleState *state = NULL;
 
     ssgBranch *tile = new ssgBranch () ;
-    tile -> setName ( path.c_str() ) ;
+    tile -> setName ( (char *)path.c_str() ) ;
 
     // Attempt to open "path.gz" or "path"
     fg_gzifstream in( path );