fly/flightgear
1
0
Fork 0
Code Activity

Borland portability tweaks.

Browse source
This commit is contained in:
curt 1998-11-23 21:48:09 +00:00
parent ecf2a3eab3
commit a83788c587
21 changed files with 125 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Airports/genapt.cxx
View file

@ -31,6 +31,11 @@
using namespace std;
#endif
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include <Debug/logstream.hxx>
// #include <Include/fg_types.h>
#include <Math/fg_geodesy.hxx>
@ -285,6 +290,9 @@ fgAptGenerate(const string& path, fgTILE *tile)
// $Log$
// Revision 1.11 1998/11/23 21:48:09 curt
// Borland portability tweaks.
//
// Revision 1.10 1998/11/07 19:07:06 curt
// Enable release builds using the --without-logging option to the configure
// script. Also a couple log message cleanups, plus some C to C++ comment

7
Airports/genapt.hxx
View file

@ -40,6 +40,10 @@
using namespace std;
#endif
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <Scenery/tile.hxx>
@ -61,6 +65,9 @@ fgAptGenerate(const string& path, fgTILE *tile);
// $Log$
// Revision 1.2 1998/11/23 21:48:10 curt
// Borland portability tweaks.
//
// Revision 1.1 1998/09/14 02:14:01 curt
// Initial revision of genapt.[ch]xx for generating airport scenery.
//

5
Astro/celestialBody.cxx
View file

@ -27,6 +27,11 @@
#include "star.hxx"
#include <Debug/logstream.hxx>
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
/**************************************************************************
* void CelestialBody::updatePosition(fgTIME *t, Star *ourSun)
*

3
Astro/celestialBody.hxx
View file

@ -32,9 +32,6 @@
#endif
#include <stdio.h>
#include <math.h>
#include <Time/fg_time.hxx>
#include <Include/fg_constants.h>

6
Astro/jupiter.cxx
View file

@ -23,6 +23,12 @@
* (Log is kept at end of this file)
**************************************************************************/
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include "jupiter.hxx"
/*************************************************************************

6
Astro/mars.cxx
View file

@ -22,6 +22,12 @@
* $Id$
* (Log is kept at end of this file)
**************************************************************************/
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include "mars.hxx"
/*************************************************************************

6
Astro/mercury.cxx
View file

@ -22,6 +22,12 @@
* $Id$
* (Log is kept at end of this file)
**************************************************************************/
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include "mercury.hxx"
/*************************************************************************

6
Astro/moon.cxx
View file

@ -29,6 +29,12 @@
#include <Debug/logstream.hxx>
#include <Objects/texload.h>
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
static GLuint moon_texid;
static GLubyte *moon_texbuf;

5
Astro/neptune.cxx
View file

@ -23,6 +23,11 @@
* (Log is kept at end of this file)
**************************************************************************/
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include "neptune.hxx"
/*************************************************************************

6
Astro/saturn.cxx
View file

@ -22,6 +22,12 @@
* $Id$
* (Log is kept at end of this file)
**************************************************************************/
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include "saturn.hxx"
/*************************************************************************

6
Astro/solarsystem.cxx
View file

@ -31,6 +31,12 @@
# include <windows.h>
#endif
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include <GL/glut.h>
#include <XGL/xgl.h>
#include <Debug/logstream.hxx>

6
Astro/star.cxx
View file

@ -22,6 +22,12 @@
* $Id$
* (Log is kept at end of this file)
**************************************************************************/
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include "star.hxx"
/*************************************************************************

4
Astro/stars.cxx
View file

@ -31,6 +31,7 @@
# include <windows.h>
#endif
#include <math.h>
#include <stdio.h>
#include <string.h>
@ -255,6 +256,9 @@ void fgStarsRender( void ) {
// $Log$
// Revision 1.23 1998/11/23 21:48:28 curt
// Borland portability tweaks.
//
// Revision 1.22 1998/11/07 19:07:07 curt
// Enable release builds using the --without-logging option to the configure
// script. Also a couple log message cleanups, plus some C to C++ comment

6
Astro/uranus.cxx
View file

@ -22,6 +22,12 @@
* $Id$
* (Log is kept at end of this file)
**************************************************************************/
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include "uranus.hxx"
/*************************************************************************

6
Astro/venus.cxx
View file

@ -22,6 +22,12 @@
* $Id$
* (Log is kept at end of this file)
**************************************************************************/
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include "venus.hxx"
/*************************************************************************

8
Cockpit/hud.cxx
View file

@ -30,6 +30,11 @@
# include <windows.h>
#endif
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include <GL/glut.h>
#include <stdlib.h>
#include <string.h>
@ -835,6 +840,9 @@ void fgUpdateHUD( void ) {
}
// $Log$
// Revision 1.28 1998/11/23 21:48:59 curt
// Borland portability tweaks.
//
// Revision 1.27 1998/11/06 21:17:47 curt
// Converted to new logstream debugging facility. This allows release
// builds with no messages at all (and no performance impact) by using

12
Main/options.cxx
View file

@ -36,16 +36,11 @@
#include <Debug/logstream.hxx>
#include <Flight/flight.hxx>
#include <Include/fg_constants.h>
#include <Main/options.hxx>
#include <Misc/fgstream.hxx>
#include "fg_serial.hxx"
#include "options.hxx"
const int fgOPTIONS::FG_RADIUS_MIN;
const int fgOPTIONS::FG_RADIUS_MAX;
inline double
atof( const string& str )
@ -623,7 +618,7 @@ void fgOPTIONS::usage ( void ) {
printf("\t--enable-textures: enable textures\n");
printf("\t--disable-wireframe: disable wireframe drawing mode\n");
printf("\t--enable-wireframe: enable wireframe drawing mode\n");
printf("\t--geomtry=WWWxHHH: specify window geometry: 640x480, 800x600\n");
printf("\t--geometry=WWWxHHH: window geometry: 640x480, 800x600, etc.\n");
printf("\n");
printf("Scenery Options:\n");
@ -647,6 +642,9 @@ fgOPTIONS::~fgOPTIONS( void ) {
// $Log$
// Revision 1.31 1998/11/23 21:49:04 curt
// Borland portability tweaks.
//
// Revision 1.30 1998/11/16 14:00:02 curt
// Added pow() macro bug work around.
// Added support for starting FGFS at various resolutions.

16
Main/options.hxx
View file

@ -42,10 +42,8 @@
#include <XGL/xgl.h>
#include <string>
#ifdef NEEDNAMESPACESTD
using namespace std;
#endif
#include <Include/compiler.h>
FG_USING_STD(string);
#include "fg_serial.hxx"
@ -74,8 +72,11 @@ public:
FG_FOG_NICEST = 2
};
static const int FG_RADIUS_MIN = 1;
static const int FG_RADIUS_MAX = 4;
enum
{
FG_RADIUS_MIN = 1,
FG_RADIUS_MAX = 4
};
private:
@ -243,6 +244,9 @@ extern fgOPTIONS current_options;
// $Log$
// Revision 1.23 1998/11/23 21:49:05 curt
// Borland portability tweaks.
//
// Revision 1.22 1998/11/20 01:02:38 curt
// Try to detect Mesa/Glide/Voodoo and chose the appropriate resolution.
//

7
Time/event.cxx
View file

@ -39,6 +39,10 @@
// contains milliseconds
#endif
#if defined( linux ) || defined( __FreeBSD__ )
# define _G_NO_EXTERN_TEMPLATES
#endif
#include "Include/fg_stl_config.h"
#include STL_ALGORITHM
#include STL_FUNCTIONAL
@ -261,6 +265,9 @@ fgEVENT_MGR::~fgEVENT_MGR( void ) {
// $Log$
// Revision 1.12 1998/11/23 21:49:07 curt
// Borland portability tweaks.
//
// Revision 1.11 1998/11/09 23:41:51 curt
// Log message clean ups.
//

8
Time/light.cxx
View file

@ -33,6 +33,11 @@
#include <GL/glut.h>
#include <XGL/xgl.h>
#ifdef __BORLANDC__
# define exception c_exception
#endif
#include <math.h>
#include <string.h>
#include <Aircraft/aircraft.hxx>
@ -212,6 +217,9 @@ fgLIGHT::~fgLIGHT( void ) {
// $Log$
// Revision 1.21 1998/11/23 21:49:09 curt
// Borland portability tweaks.
//
// Revision 1.20 1998/11/06 21:18:27 curt
// Converted to new logstream debugging facility. This allows release
// builds with no messages at all (and no performance impact) by using

6
Weather/weather.cxx
View file

@ -35,11 +35,10 @@
#include <math.h>
#include "weather.hxx"
#include <Aircraft/aircraft.hxx>
#include <Debug/logstream.hxx>
#include <Math/fg_random.h>
#include <Weather/weather.hxx>
// This is a record containing current weather info
@ -105,6 +104,9 @@ void fgWeatherSetVisibility( float visibility ) {
// $Log$
// Revision 1.3 1998/11/23 21:49:11 curt
// Borland portability tweaks.
//
// Revision 1.2 1998/11/06 21:18:29 curt
// Converted to new logstream debugging facility. This allows release
// builds with no messages at all (and no performance impact) by using