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.

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 \

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>

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

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

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>

simgear/io/lowtest.cxx

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM

simgear/io/sg_binobj.cxx

@@ -22,10 +22,6 @@
 //
 
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

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>

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>

simgear/magvar/magvar.hxx

@@ -33,10 +33,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 /**
  * Magnetic variation wrapper class.
  *

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()        

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>

simgear/metar/Antoi.cpp

@@ -37,10 +37,6 @@
 /*                                                                  */
 /********************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #ifdef HAVE_STDINT_H
 #  include <stdint.h>
 #endif

simgear/misc/props.cxx

@@ -6,10 +6,6 @@
 //
 // $Id$
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

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>

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()

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

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

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 )

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";

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

simgear/route/route.hxx

@@ -33,10 +33,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_STRING

simgear/route/waypoint.hxx

@@ -33,10 +33,6 @@
 #endif                                   
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_STRING

simgear/screen/GLBitmaps.cxx

@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #ifdef HAVE_WINDOWS_H

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

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

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

simgear/sky/cloud.cxx

@@ -16,10 +16,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

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>

simgear/sky/dome.cxx

@@ -24,7 +24,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #ifdef HAVE_WINDOWS_H

simgear/sky/moon.cxx

@@ -25,10 +25,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

simgear/sky/oursun.cxx

@@ -25,10 +25,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

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>
 

simgear/sky/sphere.cxx

@@ -23,10 +23,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include STL_IOSTREAM

simgear/sky/stars.cxx

@@ -25,10 +25,6 @@
 // $Id$
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <stdio.h>

simgear/threads/SGThread.cxx

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 #include <sys/time.h>
 

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)

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

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

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
+}

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
 

simgear/xgl/xgl.c

@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#  include <simgear_config.h>
 #endif
 
 #ifdef HAVE_WINDOWS_H

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

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>

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()

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