From: curt <curt>
Date: Thu, 12 Aug 1999 21:08:37 +0000 (+0000)
Subject: Minor tweaks to work around egcs compiler pickiness.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fdbfd9c2f82fb193309c89b95cc72012d3a8ac42;p=flightgear.git

Minor tweaks to work around egcs compiler pickiness.
---

diff --git a/src/FDM/JSBSim/FGMain.cpp b/src/FDM/JSBSim/FGMain.cpp
index 08413befd..e43f9884a 100644
--- 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 73cc8f96e..292ac66e9 100644
--- 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 38729da3f..cab9bbcf1 100644
--- 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 );