Metakit seems to really want to #define bool int, #define true 1,

#define false 0, so I massaged the header files to make this impossible.

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 2dd993de2f918173a2c92a17ae043c77b1fa1725..a3d980a467a52f0cb29f9fe0678f12273e566e18 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -21,7 +21,8 @@ METAR_DIRS =
 
 EXTRA_DIST = version.h.in
 
-include_HEADERS = compiler.h constants.h fg_traits.hxx fg_zlib.h version.h
+include_HEADERS = \
+       compiler.h constants.h fg_traits.hxx fg_zlib.h inlines.h version.h
 
 SUBDIRS = \
        bucket \

diff --git a/simgear/constants.h b/simgear/constants.h
index f4d40d2ad8ac92d1b50335a19bf9469de8971d0f..d74b2b40c562ee9373ed1e99f4091c93ce987fe1 100644 (file)
--- a/simgear/constants.h
+++ b/simgear/constants.h
@@ -21,8 +21,8 @@
 // $Id$
 
 
-#ifndef _SUPPORTGEAR_CONSTANTS_H
-#define _SUPPORTGEAR_CONSTANTS_H
+#ifndef _SG_CONSTANTS_H
+#define _SG_CONSTANTS_H
 
 
 #ifdef HAVE_CONFIG_H
@@ -140,4 +140,4 @@
 #define FG_EPSILON 0.0000001
 
 
-#endif // _SUPPORTGEAR_CONSTANTS_H
+#endif // _SG_CONSTANTS_H