From 871c005f130b6c84bebde00a9865e4937f9004f4 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 11 Dec 1998 20:26:54 +0000 Subject: [PATCH] #include tweaks. --- Time/Makefile.am | 3 ++- Time/fg_time.cxx | 12 +++--------- Time/timestamp.hxx | 12 ++++++++++++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Time/Makefile.am b/Time/Makefile.am index a74e3874b..375eccae7 100644 --- a/Time/Makefile.am +++ b/Time/Makefile.am @@ -13,6 +13,7 @@ libTime_a_SOURCES = \ fg_time.cxx fg_time.hxx \ fg_timer.cxx fg_timer.hxx \ light.cxx light.hxx \ - sunpos.cxx sunpos.hxx + sunpos.cxx sunpos.hxx \ + timestamp.hxx INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator diff --git a/Time/fg_time.cxx b/Time/fg_time.cxx index 11cb3b9a3..4dbf4edd1 100644 --- a/Time/fg_time.cxx +++ b/Time/fg_time.cxx @@ -42,15 +42,6 @@ # include // for get/setitimer, gettimeofday, struct timeval #endif -#ifdef WIN32 -# include -# if defined( __CYGWIN__ ) || defined( __CYGWIN32__ ) -# define NEAR /* */ -# define FAR /* */ -# endif -# include -#endif - #include #include #include @@ -398,6 +389,9 @@ void fgTimeUpdate(FGState *f, fgTIME *t) { // $Log$ +// Revision 1.27 1998/12/11 20:26:55 curt +// #include tweaks. +// // Revision 1.26 1998/12/05 15:54:28 curt // Renamed class fgFLIGHT to class FGState as per request by JSB. // diff --git a/Time/timestamp.hxx b/Time/timestamp.hxx index 43f0685aa..c27eaefd5 100644 --- a/Time/timestamp.hxx +++ b/Time/timestamp.hxx @@ -52,6 +52,15 @@ # include // for get/setitimer, gettimeofday, struct timeval #endif +#ifdef WIN32 +# include +# if defined( __CYGWIN__ ) || defined( __CYGWIN32__ ) +# define NEAR /* */ +# define FAR /* */ +# endif +# include +#endif + class fgTIMESTAMP { @@ -149,6 +158,9 @@ inline long operator - (const fgTIMESTAMP& a, const fgTIMESTAMP& b) // $Log$ +// Revision 1.2 1998/12/11 20:26:56 curt +// #include tweaks. +// // Revision 1.1 1998/12/05 14:21:33 curt // Moved struct fg_timestamp to class fgTIMESTAMP and moved it's definition // to it's own file, timestamp.hxx. -- 2.39.5