fly/flightgear
1
0
Fork 0
Code Activity

Various MSVC patches.

Browse source
This commit is contained in:
curt 2001-10-24 21:25:11 +00:00
parent 33854d9f6a
commit 535d708ee0
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Cockpit/panel.cxx
View file

@ -48,7 +48,10 @@
#define WIN_W 1024 #define WIN_W 1024
#define WIN_H 768 #define WIN_H 768
#ifdef NONE #ifdef defined( NONE ) && defined( _MSC_VER )
# pragma message( "A sloppy coder has defined NONE as a macro!!!" )
# undef NONE
#elif defined( NONE )
# pragma warn A sloppy coder has defined NONE as a macro!!! # pragma warn A sloppy coder has defined NONE as a macro!!!
# undef NONE # undef NONE
#endif #endif

10
src/Main/main.cxx
View file

@ -1515,10 +1515,6 @@ int mainLoop( int argc, char **argv ) {
argc = ccommand( &argv ); argc = ccommand( &argv );
#endif #endif
#ifdef HAVE_BC5PLUS
_control87(MCW_EM, MCW_EM); /* defined in float.h */
#endif
// set default log levels // set default log levels
sglog().setLogLevels( SG_ALL, SG_INFO ); sglog().setLogLevels( SG_ALL, SG_INFO );
@ -1859,11 +1855,15 @@ int mainLoop( int argc, char **argv ) {
// Main entry point; catch any exceptions that have made it this far. // Main entry point; catch any exceptions that have made it this far.
int main ( int argc, char **argv ) { int main ( int argc, char **argv ) {
#ifdef _MSC_VER #if defined( _MSC_VER ) && defined( DEBUG )
// Christian, we should document what this does // Christian, we should document what this does
_control87( _EM_INEXACT, _MCW_EM ); _control87( _EM_INEXACT, _MCW_EM );
#endif #endif
#if defined( HAVE_BC5PLUS )
_control87(MCW_EM, MCW_EM); /* defined in float.h */
#endif
// FIXME: add other, more specific // FIXME: add other, more specific
// exceptions. // exceptions.
try { try {

2
src/Scenery/tileentry.cxx
View file

@ -342,6 +342,8 @@ void *fgBillboard( ssgBranch *lightmaps, ssgVertexArray *light_maps, ssgSimpleSt
leaf->setState( lightmap_state ); leaf->setState( lightmap_state );
lightmaps->addKid( leaf ); lightmaps->addKid( leaf );
} }
return NULL;
} }
ssgBranch* FGTileEntry::gen_runway_lights( ssgVertexArray *points,ssgVertexArray *normal, ssgBranch* FGTileEntry::gen_runway_lights( ssgVertexArray *points,ssgVertexArray *normal,