From 5f26ba99bc61ff7c12822bda1a726247746482d1 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 2 Feb 1999 20:13:29 +0000 Subject: [PATCH] MSVC++ portability changes by Bernie Bright: Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete. Simulator/Astro/stars.cxx: typo? included instead of Simulator/Cockpit/hud.cxx: Added Standard headers Simulator/Cockpit/panel.cxx: Redefinition of default parameter Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted Simulator/Main/fg_init.cxx: Simulator/Main/GLUTmain.cxx: Simulator/Main/options.hxx: Shuffled dependency Simulator/Objects/material.hxx: Simulator/Time/timestamp.hxx: VC++ friend kludge Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations Simulator/Main/views.hxx: Added a constant --- Astro/sky.cxx | 18 +++++++++++++++++- Astro/stars.cxx | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/Astro/sky.cxx b/Astro/sky.cxx index 0e9c32e4..9f3bb50c 100644 --- a/Astro/sky.cxx +++ b/Astro/sky.cxx @@ -300,7 +300,7 @@ void fgSkyRender( void ) { xglBegin( GL_TRIANGLE_FAN ); xglColor4fv(l->sky_color); xglVertex3f(0.0, 0.0, CENTER_ELEV); - for ( i = 11; i >= 0; i++ ) { + for ( i = 11; i >= 0; i-- ) { xglColor4fv( inner_color ); xglVertex3fv( inner_vertex[i] ); } @@ -362,6 +362,22 @@ void fgSkyRender( void ) { // $Log$ +// Revision 1.20 1999/02/02 20:13:29 curt +// MSVC++ portability changes by Bernie Bright: +// +// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete. +// Simulator/Astro/stars.cxx: typo? included instead of +// Simulator/Cockpit/hud.cxx: Added Standard headers +// Simulator/Cockpit/panel.cxx: Redefinition of default parameter +// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG. Deleted +// Simulator/Main/fg_init.cxx: +// Simulator/Main/GLUTmain.cxx: +// Simulator/Main/options.hxx: Shuffled dependency +// Simulator/Objects/material.hxx: +// Simulator/Time/timestamp.hxx: VC++ friend kludge +// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations +// Simulator/Main/views.hxx: Added a constant +// // Revision 1.19 1999/02/01 21:33:26 curt // Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since // Jon accepted my offer to do this and thought it was a good idea. diff --git a/Astro/stars.cxx b/Astro/stars.cxx index 118f3395..8aae8157 100644 --- a/Astro/stars.cxx +++ b/Astro/stars.cxx @@ -31,12 +31,20 @@ # include #endif +#include "Include/compiler.h" +#ifdef FG_HAVE_STD_INCLUDES +# include +# include +# include +# include +#else +# include +# include +# include +# include +#endif -#include -#include -#include #include -#include #include #include @@ -49,9 +57,11 @@ #include
#include #include