From: Bruno Haible <bruno@clisp.org>
Date: Sun, 26 Oct 2008 13:29:43 +0000 (+0100)
Subject: Fix a clash between the type DATADIR on Windows and the macro DATADIR.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d45d1e67873d2988c923aa182c26e4d6cfe0d0e;p=pspp

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

diff --git a/ChangeLog b/ChangeLog
index f4c475c459..67c5f820e0 100644
--- 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 003919e794..94a353a0ff 100644
--- 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 a1169a933b..5160128e6e 100644
--- 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+