Fix a clash between the type DATADIR on Windows and the macro DATADIR.

diff --git a/ChangeLog b/ChangeLog
index f4c475c4593f72e1bcd607ed424f79c008c6209b..67c5f820e0affca371a695553ef1cb1acb7448c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-26  Bruno Haible  <bruno@clisp.org>
+
+       Fix a clash between the type DATADIR on Windows and the macro DATADIR.
+       * modules/configmake (Include): Add a note that the include must come
+       after all system headers.
+       * lib/javaversion.c: Include configmake.h after all other includes.
+       Reported by Simon Josefsson.
+
 2008-10-26  Bruno Haible  <bruno@clisp.org>
 
        * m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Set default of

diff --git a/lib/javaversion.c b/lib/javaversion.c
index 003919e794bbf843099ab45aacd5364141ec42c1..94a353a0ff7e0184c79688981f61d38d7e1728f2 100644 (file)
--- a/lib/javaversion.c
+++ b/lib/javaversion.c
@@ -30,9 +30,6 @@
 # define relocate(pathname) (pathname)
 #endif
 
-/* Get PKGDATADIR.  */
-#include "configmake.h"
-
 #include "javaexec.h"
 #include "pipe.h"
 #include "wait-process.h"
@@ -41,6 +38,9 @@
 
 #define _(str) gettext (str)
 
+/* Get PKGDATADIR.  */
+#include "configmake.h"
+
 
 struct locals
 {

diff --git a/modules/configmake b/modules/configmake
index a1169a933bb872f8f5f765090825d2e355a95646..5160128e6ea105ebf0099afbb069052b49eb530e 100644 (file)
--- a/modules/configmake
+++ b/modules/configmake
@@ -61,7 +61,8 @@ BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
 
 Include:
-"configmake.h"
+/* Include only after all system include files.  */
+#include "configmake.h"
 
 License:
 LGPLv2+