fly/flightgear
1
0
Fork 0
Code Activity

Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)

Browse source 
Other misc. tweaks.
This commit is contained in:
curt 1998-11-02 18:25:34 +00:00
parent 80b8037230
commit 2612ab0ab3
4 changed files with 15 additions and 5 deletions

6
Airports/simple.hxx
View file

@ -70,7 +70,7 @@ operator >> ( istream& in, fgAIRPORT& a )
class fgAIRPORTS { class fgAIRPORTS {
public: public:
#ifdef _FG_NO_DEFAULT_TEMPLATE_ARGS #ifdef FG_NO_DEFAULT_TEMPLATE_ARGS
typedef set< fgAIRPORT, less< fgAIRPORT > > container; typedef set< fgAIRPORT, less< fgAIRPORT > > container;
#else #else
typedef set< fgAIRPORT > container; typedef set< fgAIRPORT > container;
@ -105,6 +105,10 @@ public:
// $Log$ // $Log$
// Revision 1.5 1998/11/02 18:25:34 curt
// Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)
// Other misc. tweaks.
//
// Revision 1.4 1998/09/08 21:38:43 curt // Revision 1.4 1998/09/08 21:38:43 curt
// Changes by Bernie Bright. // Changes by Bernie Bright.
// //

2
Joystick/js.cxx
View file

@ -1,5 +1,5 @@
#include "js.h" #include "js.hxx"
jsJoystick js0 ( 0 ) ; jsJoystick js0 ( 0 ) ;
jsJoystick js1 ( 1 ) ; jsJoystick js1 ( 1 ) ;

6
Main/GLUTkey.cxx
View file

@ -272,10 +272,8 @@ void GLUTkey(unsigned char k, int x, int y) {
// Handle "special" keyboard events // Handle "special" keyboard events
void GLUTspecialkey(int k, int x, int y) { void GLUTspecialkey(int k, int x, int y) {
fgCONTROLS *c;
fgVIEW *v; fgVIEW *v;
c = current_aircraft.controls;
v = &current_view; v = &current_view;
fgPrintf( FG_INPUT, FG_DEBUG, "Special key hit = %d", k); fgPrintf( FG_INPUT, FG_DEBUG, "Special key hit = %d", k);
@ -389,6 +387,10 @@ void GLUTspecialkey(int k, int x, int y) {
// $Log$ // $Log$
// Revision 1.31 1998/11/02 18:25:37 curt
// Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)
// Other misc. tweaks.
//
// Revision 1.30 1998/10/25 14:08:46 curt // Revision 1.30 1998/10/25 14:08:46 curt
// Turned "struct fgCONTROLS" into a class, with inlined accessor functions. // Turned "struct fgCONTROLS" into a class, with inlined accessor functions.
// //

6
Time/fg_time.cxx
View file

@ -44,7 +44,7 @@
#ifdef WIN32 #ifdef WIN32
# include <windows.h> # include <windows.h>
# ifdef __CYGWIN32__ # if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )
# define NEAR /* */ # define NEAR /* */
# define FAR /* */ # define FAR /* */
# endif # endif
@ -448,6 +448,10 @@ void fgTimeUpdate(fgFLIGHT *f, fgTIME *t) {
// $Log$ // $Log$
// Revision 1.20 1998/11/02 18:25:38 curt
// Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)
// Other misc. tweaks.
//
// Revision 1.19 1998/10/17 01:34:29 curt // Revision 1.19 1998/10/17 01:34:29 curt
// C++ ifying ... // C++ ifying ...
// //