fly/flightgear
1
0
Fork 0
Code Activity

Minor tweaks to work around egcs compiler pickiness.

Browse source
This commit is contained in:
curt 1999-08-12 21:08:37 +00:00
parent e945d2b761
commit fdbfd9c2f8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/JSBSim/FGMain.cpp
View file

@ -12,7 +12,7 @@
#include <iostream>
#include <ctime>
void main(int argc, char** argv)
int main(int argc, char** argv)
{
FGFDMExec* FDMExec;

2
src/Objects/materialmgr.cxx
View file

@ -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 );

2
src/Objects/obj.cxx
View file

@ -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 );