Attempt to resolve ambiguity between #include <config.h> for simgear vs.

flightgear, especially when this occurs in a simgear .hxx file.  This is
now expressly forbidden, and will cause problems anyways because we now
changed the name to <simgear_config.h> which isn't installed, so you can't
include it in an installed header file.

diff --git a/configure.in b/configure.in
index df240e4a8a28bdc35c5c8edc1e01c0273070f6e6..ab539c2156ca02d9f9f21fddb968ca1418ef207d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -286,7 +286,7 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
        random setitimer getitimer signal GetLocalTime rint getrusage )
 
-AM_CONFIG_HEADER(simgear/config.h)
+AM_CONFIG_HEADER(simgear/simgear_config.h)
 
 AC_OUTPUT( \
        Makefile \

diff --git a/simgear/bucket/newbucket.cxx b/simgear/bucket/newbucket.cxx
index f3c0bee05a4d06f2a5fc8b34df907c37d498ae4a..08ec934a5b4300efae88fac10a7a41f9d0a9c148 100644 (file)
--- a/simgear/bucket/newbucket.cxx
+++ b/simgear/bucket/newbucket.cxx
@@ -24,11 +24,6 @@
  **************************************************************************/
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-
 #include <math.h>
 
 #include <simgear/misc/sg_path.hxx>

diff --git a/simgear/constants.h b/simgear/constants.h
index da6986e057bc0102cb01f4735c091f282e54b3e6..f0a094350f05457f55f55b5383311cca206955b7 100644 (file)
--- a/simgear/constants.h
+++ b/simgear/constants.h
@@ -30,10 +30,6 @@
 #define _SG_CONSTANTS_H
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #ifdef SG_HAVE_STD_INCLUDES

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index 63d3ed10e0e7888bf9d51cd750a2316b5b0aa349..6d89620f9da463e1a4d45bc87b60bbf6c97adb29 100644 (file)
--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -26,10 +26,6 @@
 #ifndef _LOGSTREAM_H
 #define _LOGSTREAM_H
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 // At least Irix needs this

diff --git a/simgear/ephemeris/ephemeris.hxx b/simgear/ephemeris/ephemeris.hxx
index cb677c3bcd180a873898c009758f3e8f03a0fb43..46029601a14de2532bc793bfaa1cf0babefa412a 100644 (file)
--- a/simgear/ephemeris/ephemeris.hxx
+++ b/simgear/ephemeris/ephemeris.hxx
@@ -31,10 +31,6 @@
 #define _EPHEMERIS_HXX
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <plib/sg.h>
 
 #include <simgear/ephemeris/star.hxx>

diff --git a/simgear/io/lowtest.cxx b/simgear/io/lowtest.cxx
index a808915cff55a9f5bd2b2f15161eb16439a2eab6..e588f2c35601baf2df7f0b23a624385a9ea81802 100644 (file)
--- a/simgear/io/lowtest.cxx
+++ b/simgear/io/lowtest.cxx
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM

diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx
index 54ffe7dd60a4c0f28a48a58ec5a20d7e8231a16d..474a2f21502b40bdf145758b26524a69c2c6d315 100644 (file)
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -22,10 +22,6 @@
 //
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx
index 5809cf08e4c729aa89710b6719bdf1d0da5ed4a3..9ba989705ba23e2c07f73842b35504ca034b0ff1 100644 (file)
--- a/simgear/io/sg_binobj.hxx
+++ b/simgear/io/sg_binobj.hxx
@@ -28,10 +28,6 @@
 #define _SG_BINOBJ_HXX
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <plib/sg.h>
 
 #include <simgear/compiler.h>

diff --git a/simgear/magvar/magvar.cxx b/simgear/magvar/magvar.cxx
index 41dca19b480950af7d279950557648cb826b01be..4a78ce34dad291440b3f236e88ae06e10665dc30 100644 (file)
--- a/simgear/magvar/magvar.cxx
+++ b/simgear/magvar/magvar.cxx
@@ -21,10 +21,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <math.h>
 
 #include <simgear/magvar/magvar.hxx>

diff --git a/simgear/magvar/magvar.hxx b/simgear/magvar/magvar.hxx
index 4180c9612883b8734954ebfc3576dae425d7ffb0..6e46dd24076172aec15a77709bea3b73166ed332 100644 (file)
--- a/simgear/magvar/magvar.hxx
+++ b/simgear/magvar/magvar.hxx
@@ -33,10 +33,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 /**
  * Magnetic variation wrapper class.
  *

diff --git a/simgear/math/sg_random.c b/simgear/math/sg_random.c
index 31297e19829624cb94487c15b0a3cc413e17c3df..2e9ceb9c4465846b4ffd2a59bf4dd41f8b34ddc8 100644 (file)
--- a/simgear/math/sg_random.c
+++ b/simgear/math/sg_random.c
@@ -22,10 +22,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>         // for random(), srandom()
 #include <time.h>           // for time() to seed srandom()        

diff --git a/simgear/math/vector.hxx b/simgear/math/vector.hxx
index 75893c18c2585227a5afadb6f3a801c6133a4f47..872643a64d9dc015f92367bd99acb4dfe4e9f4ff 100644 (file)
--- a/simgear/math/vector.hxx
+++ b/simgear/math/vector.hxx
@@ -33,10 +33,6 @@
 # error This library requires C++
 #endif                                   
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <plib/sg.h>

diff --git a/simgear/metar/Antoi.cpp b/simgear/metar/Antoi.cpp
index fabb31c2c8fd98aaee67b38f65f1d4d35c6417d5..783548e5665a5f1fc86e0d39f0a1c1d6526e2d35 100644 (file)
--- a/simgear/metar/Antoi.cpp
+++ b/simgear/metar/Antoi.cpp
@@ -37,10 +37,6 @@
 /*                                                                  */
 /********************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #ifdef HAVE_STDINT_H
 #  include <stdint.h>
 #endif

diff --git a/simgear/misc/props.cxx b/simgear/misc/props.cxx
index 1fbfb31100f3c93dcd08171d54808cfc983185fc..42ce347d79a68fa93cc67b05fef94090588819e1 100644 (file)
--- a/simgear/misc/props.cxx
+++ b/simgear/misc/props.cxx
@@ -6,10 +6,6 @@
 //
 // $Id$
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

diff --git a/simgear/misc/props.hxx b/simgear/misc/props.hxx
index ad9e9e01f620a96b4d584132cfd2e3ca8ea62056..b95c52968562200b9bb204c38cb96e41b214e5c7 100644 (file)
--- a/simgear/misc/props.hxx
+++ b/simgear/misc/props.hxx
@@ -12,10 +12,6 @@
 #ifndef __PROPS_HXX
 #define __PROPS_HXX
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

diff --git a/simgear/misc/props_io.cxx b/simgear/misc/props_io.cxx
index d88376e82016d1c593d0fa6987ce4fa4f8bd6c6f..d7be49503df0f5417bcc4d9d195a3f36917e32bd 100644 (file)
--- a/simgear/misc/props_io.cxx
+++ b/simgear/misc/props_io.cxx
@@ -1,8 +1,4 @@
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdlib.h>            // atof() atoi()

diff --git a/simgear/misc/props_test.cxx b/simgear/misc/props_test.cxx
index 3ee2552d35349a809e21f7e4d4cd0c6509f56ef5..17f82c7ee79d3016963e1d6ac3c22607192edcc8 100644 (file)
--- a/simgear/misc/props_test.cxx
+++ b/simgear/misc/props_test.cxx
@@ -3,10 +3,6 @@
 // Test harness.
 ////////////////////////////////////////////////////////////////////////
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM

diff --git a/simgear/misc/sg_path.hxx b/simgear/misc/sg_path.hxx
index 8fd5c3ec4353726e111bf6458c27ec7524239bc2..3bc672240a3f6b43086d2a035293efdaf7ee3e53 100644 (file)
--- a/simgear/misc/sg_path.hxx
+++ b/simgear/misc/sg_path.hxx
@@ -30,10 +30,6 @@
 #define _SG_PATH_HXX
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_STRING

diff --git a/simgear/misc/sgstream.hxx b/simgear/misc/sgstream.hxx
index 7473ee870195e7ee84dd5f6f1938b457f18b8067..373ebc7914f9eb23a667c90fc0a5319db72910f5 100644 (file)
--- a/simgear/misc/sgstream.hxx
+++ b/simgear/misc/sgstream.hxx
@@ -32,10 +32,6 @@
 # error This library requires C++
 #endif                                   
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #if defined( SG_HAVE_STD_INCLUDES )

diff --git a/simgear/misc/strutils.cxx b/simgear/misc/strutils.cxx
index a08f19c878ac4516e74db18374dbc2a9cacd9071..2e7afbebdb32da18f2a408868d38e4ee0de2cbfd 100644 (file)
--- a/simgear/misc/strutils.cxx
+++ b/simgear/misc/strutils.cxx
@@ -21,10 +21,6 @@
 //
 // $Id$
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include "strutils.hxx"
 
 const string whitespace = " \n\r\t";

diff --git a/simgear/misc/zfstream.hxx b/simgear/misc/zfstream.hxx
index cfd7731ac8c17067fb0975bbfb81b9102cfb520f..1dd3669e1b1853af6dcfccd72163689b0b975d9a 100644 (file)
--- a/simgear/misc/zfstream.hxx
+++ b/simgear/misc/zfstream.hxx
@@ -28,10 +28,6 @@
 #ifndef _zfstream_hxx
 #define _zfstream_hxx
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #ifdef HAVE_ZLIB

diff --git a/simgear/route/route.hxx b/simgear/route/route.hxx
index 326ca88360df882cfca4c91b09daff3bb0d359f3..cffeffd768684d8ddc7f50aed9ed6c6c774689a7 100644 (file)
--- a/simgear/route/route.hxx
+++ b/simgear/route/route.hxx
@@ -33,10 +33,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_STRING

diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index a02b6e31fe35fcaf28d23c9ecd42618f93246840..aa6d8ed472ac6713f400f8df5af926fdfd763cec 100644 (file)
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -33,10 +33,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_STRING

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index 0edadf4189b47f142ff4b6afb29f4f202a16511d..0e9544ce70df3a43b3f7b5c1f1b3dfadc00de30b 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #ifdef HAVE_WINDOWS_H

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index 8a9da20fd88fb80559e478609c4eb206d7b705cd..47a40f224b0c1283c757b873f1490fa883ff79e6 100644 (file)
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -21,7 +21,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #ifdef HAVE_WINDOWS_H

diff --git a/simgear/serial/serial.cxx b/simgear/serial/serial.cxx
index 2c707b18d0897d5852c069d58e2d2136af62b090..3fa85bdc1b7f9fd4508fdae46872dd5038838c75 100644 (file)
--- a/simgear/serial/serial.cxx
+++ b/simgear/serial/serial.cxx
@@ -22,10 +22,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #ifdef SG_HAVE_STD_INCLUDE

diff --git a/simgear/serial/serial.hxx b/simgear/serial/serial.hxx
index 7534372c1a9ffdf7b81aba475a8f54c136b67465..e98c3163452bd907d49f2d546b45a35a8d182acb 100644 (file)
--- a/simgear/serial/serial.hxx
+++ b/simgear/serial/serial.hxx
@@ -33,10 +33,6 @@
 # error This library requires C++
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined( __CYGWIN32__ )
 #  include <windows.h>
 #endif

diff --git a/simgear/sky/cloud.cxx b/simgear/sky/cloud.cxx
index 31997dd60bbe5f25962f5fae92044d099ee86a42..8a69e3150fca822aef0da067fec832127d0f77a2 100644 (file)
--- a/simgear/sky/cloud.cxx
+++ b/simgear/sky/cloud.cxx
@@ -16,10 +16,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

diff --git a/simgear/sky/cloud.hxx b/simgear/sky/cloud.hxx
index ee1b12f2916f629e55de51ae45f68bf37476e7ba..5f7258e73819a6f68c310f66937645d1c5359d98 100644 (file)
--- a/simgear/sky/cloud.hxx
+++ b/simgear/sky/cloud.hxx
@@ -25,10 +25,6 @@
 #ifndef _SG_CLOUD_HXX_
 #define _SG_CLOUD_HXX_
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <plib/ssg.h>

diff --git a/simgear/sky/dome.cxx b/simgear/sky/dome.cxx
index 98961fac99c0792cc457703e54674bd9c18223bd..2289729420f803547100709b8d667c96bd5974f8 100644 (file)
--- a/simgear/sky/dome.cxx
+++ b/simgear/sky/dome.cxx
@@ -24,7 +24,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #ifdef HAVE_WINDOWS_H

diff --git a/simgear/sky/moon.cxx b/simgear/sky/moon.cxx
index 513cdf4f28b22ee1f30361fd0b9ad51e8fca8786..00ce42a4bd4e07774229db7bc30a5d76553724c3 100644 (file)
--- a/simgear/sky/moon.cxx
+++ b/simgear/sky/moon.cxx
@@ -25,10 +25,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

diff --git a/simgear/sky/oursun.cxx b/simgear/sky/oursun.cxx
index 6dffc90ce53d180f48414806f8c27fe69b5c1dc4..e423db02328fea5e5cbf8b7c71fa22f001720d5e 100644 (file)
--- a/simgear/sky/oursun.cxx
+++ b/simgear/sky/oursun.cxx
@@ -25,10 +25,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

diff --git a/simgear/sky/sky.cxx b/simgear/sky/sky.cxx
index fee1b601aafdf9682fe7fdd66d91b829e699da6a..69bd8b2839d19e96f323502fdcf77b1b7f5ab325 100644 (file)
--- a/simgear/sky/sky.cxx
+++ b/simgear/sky/sky.cxx
@@ -23,10 +23,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <plib/sg.h>
 #include <plib/ssg.h>
 

diff --git a/simgear/sky/sphere.cxx b/simgear/sky/sphere.cxx
index 877489fc029bd21f8869b8c5536aa8f462e7f032..428d966b3ba05652ac3904e1d429df174ca13b2e 100644 (file)
--- a/simgear/sky/sphere.cxx
+++ b/simgear/sky/sphere.cxx
@@ -23,10 +23,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM

diff --git a/simgear/sky/stars.cxx b/simgear/sky/stars.cxx
index b2bf7c009549b6ca1ccf548990785ae80785e363..3ee2ce312fd81528316a094f8b62d88bf2d78b0e 100644 (file)
--- a/simgear/sky/stars.cxx
+++ b/simgear/sky/stars.cxx
@@ -25,10 +25,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

diff --git a/simgear/threads/SGThread.cxx b/simgear/threads/SGThread.cxx
index b3bb8ab2eb79d8e98a2c28695936337f788d4c59..ac3ee93343b2bdf7d6a3c02a7cb21afde0b3ba85 100644 (file)
--- a/simgear/threads/SGThread.cxx
+++ b/simgear/threads/SGThread.cxx
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 #include <sys/time.h>
 

diff --git a/simgear/timing/Makefile.am b/simgear/timing/Makefile.am
index ffe602fe836d924044f2bda3023004e929fdb74e..c90b9367baef0661725ca217e93c260de9166d18 100644 (file)
--- a/simgear/timing/Makefile.am
+++ b/simgear/timing/Makefile.am
@@ -13,6 +13,7 @@ libsgtiming_a_SOURCES = \
        geocoord.cxx \
        lowleveltime.cxx \
        sg_time.cxx \
+       timestamp.cxx \
        timezone.cxx
 
 INCLUDES += -I$(top_srcdir)

diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx
index 91a2d8efbcc6958994d0da8d91b4908703637c5c..2db16af87d7e7587f8b2589f117ab04500953cad 100644 (file)
--- a/simgear/timing/sg_time.cxx
+++ b/simgear/timing/sg_time.cxx
@@ -22,10 +22,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <errno.h>             // for errno

diff --git a/simgear/timing/sg_time.hxx b/simgear/timing/sg_time.hxx
index 6d617db7a0a1a1dd5ab59153059c2fa3970e959b..8997ffa0003315025bf5ad1988a0b084e9150c34 100644 (file)
--- a/simgear/timing/sg_time.hxx
+++ b/simgear/timing/sg_time.hxx
@@ -34,10 +34,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #ifdef SG_HAVE_STD_INCLUDES

diff --git a/simgear/timing/timestamp.cxx b/simgear/timing/timestamp.cxx
new file mode 100644 (file)
index 0000000..7c8cffa
--- /dev/null
+++ b/simgear/timing/timestamp.cxx
@@ -0,0 +1,124 @@
+/**
+ * \file timestamp.cxx
+ * Provides a class for managing a timestamp (seconds & milliseconds.)
+ */
+
+// Written by Curtis Olson, started December 1998.
+//
+// Copyright (C) 1998  Curtis L. Olson  - curt@flightgear.org
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// $Id$
+
+
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
+#include <simgear/compiler.h>
+
+#ifdef SG_HAVE_STD_INCLUDES
+#  include <ctime>
+#else
+#  include <time.h>
+#endif
+
+#ifdef HAVE_SYS_TIMEB_H
+#  include <sys/timeb.h> // for ftime() and struct timeb
+#endif
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>    // for gettimeofday()
+#endif
+#ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
+#endif
+
+// -dw- want to use metrowerks time.h
+#ifdef macintosh
+#  include <time.h>
+#  include <timer.h>
+#endif
+
+#ifdef WIN32
+#  include <windows.h>
+#  if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )
+#    define NEAR /* */
+#    define FAR  /* */
+#  endif
+#  include <mmsystem.h>
+#endif
+
+#include "timestamp.hxx"
+
+
+void SGTimeStamp::stamp() {
+#if defined( WIN32 )
+    unsigned int t;
+    t = timeGetTime();
+    seconds = 0;
+    usec =  t * 1000;
+#elif defined( HAVE_GETTIMEOFDAY )
+    struct timeval current;
+    struct timezone tz;
+    // sg_timestamp currtime;
+    gettimeofday(&current, &tz);
+    seconds = current.tv_sec;
+    usec = current.tv_usec;
+#elif defined( HAVE_GETLOCALTIME )
+    SYSTEMTIME current;
+    GetLocalTime(&current);
+    seconds = current.wSecond;
+    usec = current.wMilliseconds * 1000;
+#elif defined( HAVE_FTIME )
+    struct timeb current;
+    ftime(&current);
+    seconds = current.time;
+    usec = current.millitm * 1000;
+// -dw- uses time manager
+#elif defined( macintosh )
+    UnsignedWide ms;
+    Microseconds(&ms);
+       
+    seconds = ms.lo / 1000000;
+    usec = ms.lo - ( seconds * 1000000 );
+#else
+# error Port me
+#endif
+}
+
+// increment the time stamp by the number of microseconds (usec)
+SGTimeStamp operator + (const SGTimeStamp& t, const long& m) {
+#ifdef WIN32
+    return SGTimeStamp( 0, t.usec + m );
+#else
+    return SGTimeStamp( t.seconds + ( t.usec + m ) / 1000000,
+                       ( t.usec + m ) % 1000000 );
+#endif
+}
+
+// difference between time stamps in microseconds (usec)
+long operator - (const SGTimeStamp& a, const SGTimeStamp& b)
+{
+#if defined( WIN32 )
+    return a.usec - b.usec;
+#else
+    return 1000000 * (a.seconds - b.seconds) + (a.usec - b.usec);
+#endif
+}

diff --git a/simgear/timing/timestamp.hxx b/simgear/timing/timestamp.hxx
index 82aa0be0f0897ab100bf5ad06a0520eaf4b6f031..3a31ba58df9f89d7317999c3e6e32df500aa5450 100644 (file)
--- a/simgear/timing/timestamp.hxx
+++ b/simgear/timing/timestamp.hxx
@@ -33,46 +33,8 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <ctime>
-#else
-#  include <time.h>
-#endif
-
-#ifdef HAVE_SYS_TIMEB_H
-#  include <sys/timeb.h> // for ftime() and struct timeb
-#endif
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>    // for gettimeofday()
-#endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
-#endif
-
-// -dw- want to use metrowerks time.h
-#ifdef macintosh
-#  include <time.h>
-#  include <timer.h>
-#endif
-
-#ifdef WIN32
-#  include <windows.h>
-#  if defined( __CYGWIN__ ) || defined( __CYGWIN32__ )
-#    define NEAR /* */
-#    define FAR  /* */
-#  endif
-#  include <mmsystem.h>
-#endif
 
 // MSVC++ 6.0 kuldge - Need forward declaration of friends.
 class SGTimeStamp;
@@ -158,61 +120,6 @@ inline SGTimeStamp& SGTimeStamp::operator = (const SGTimeStamp& t)
     return *this;
 }
 
-inline void SGTimeStamp::stamp() {
-#if defined( WIN32 )
-    unsigned int t;
-    t = timeGetTime();
-    seconds = 0;
-    usec =  t * 1000;
-#elif defined( HAVE_GETTIMEOFDAY )
-    struct timeval current;
-    struct timezone tz;
-    // sg_timestamp currtime;
-    gettimeofday(&current, &tz);
-    seconds = current.tv_sec;
-    usec = current.tv_usec;
-#elif defined( HAVE_GETLOCALTIME )
-    SYSTEMTIME current;
-    GetLocalTime(&current);
-    seconds = current.wSecond;
-    usec = current.wMilliseconds * 1000;
-#elif defined( HAVE_FTIME )
-    struct timeb current;
-    ftime(&current);
-    seconds = current.time;
-    usec = current.millitm * 1000;
-// -dw- uses time manager
-#elif defined( macintosh )
-    UnsignedWide ms;
-    Microseconds(&ms);
-       
-    seconds = ms.lo / 1000000;
-    usec = ms.lo - ( seconds * 1000000 );
-#else
-# error Port me
-#endif
-}
-
-// increment the time stamp by the number of microseconds (usec)
-inline SGTimeStamp operator + (const SGTimeStamp& t, const long& m) {
-#ifdef WIN32
-    return SGTimeStamp( 0, t.usec + m );
-#else
-    return SGTimeStamp( t.seconds + ( t.usec + m ) / 1000000,
-                       ( t.usec + m ) % 1000000 );
-#endif
-}
-
-// difference between time stamps in microseconds (usec)
-inline long operator - (const SGTimeStamp& a, const SGTimeStamp& b)
-{
-#if defined( WIN32 )
-    return a.usec - b.usec;
-#else
-    return 1000000 * (a.seconds - b.seconds) + (a.usec - b.usec);
-#endif
-}
-
 
 #endif // _TIMESTAMP_HXX
 

diff --git a/simgear/xgl/xgl.c b/simgear/xgl/xgl.c
index 653805240e350521569408ddc8b60d5f0e814469..a3db64bb3dfc0dac1cdc9f383e725e13dac45b75 100644 (file)
--- a/simgear/xgl/xgl.c
+++ b/simgear/xgl/xgl.c
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #ifdef HAVE_WINDOWS_H

diff --git a/simgear/xgl/xgl.h b/simgear/xgl/xgl.h
index 434ab09d6ec862d0560b13667b152e124a6bc093..366cf4796d16ba4036cbccd56084dc2657631864 100644 (file)
--- a/simgear/xgl/xgl.h
+++ b/simgear/xgl/xgl.h
@@ -2,6 +2,10 @@
 #define _XGL_H
 
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif

diff --git a/simgear/xgl/xglUtils.c b/simgear/xgl/xglUtils.c
index d781fa23fdcf2985428ea852acdad3e9edb1a23e..073a286d999fc34e547a3a2a4c38f69881ea4c96 100644 (file)
--- a/simgear/xgl/xglUtils.c
+++ b/simgear/xgl/xglUtils.c
@@ -1,8 +1,4 @@
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
index ab97d2180f8267b7df747dc09bf7b6f15605dcfd..a7aea3daf249525d91d3f858d02e64b7c0842764 100644 (file)
--- a/simgear/xml/easyxml.cxx
+++ b/simgear/xml/easyxml.cxx
@@ -1,9 +1,5 @@
 // easyxml.cxx - implementation of EasyXML interfaces.
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <string.h>            // strcmp()

diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx
index 1eee84eb8a23c41599f02d0f47a12ef8a213bc09..dc7297bef03c463e0a4ae0ddc805bd9ab041630c 100644 (file)
--- a/simgear/xml/easyxml.hxx
+++ b/simgear/xml/easyxml.hxx
@@ -8,10 +8,6 @@
 #ifndef __EASYXML_HXX
 #define __EASYXML_HXX
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM