Mercurial > gnulib

changeset 30413:7cca4bff94d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a clash between the type DATADIR on Windows and the macro DATADIR.
author Bruno Haible <bruno@clisp.org>
date Sun, 26 Oct 2008 14:29:43 +0100
parents 73240d2a9535
children fcf1ec8dfc77
files ChangeLog lib/javaversion.c modules/configmake
diffstat 3 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Oct 26 12:38:39 2008 +0100
+++ b/ChangeLog	Sun Oct 26 14:29:43 2008 +0100
@@ -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
--- a/lib/javaversion.c	Sun Oct 26 12:38:39 2008 +0100
+++ b/lib/javaversion.c	Sun Oct 26 14:29:43 2008 +0100
@@ -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
 {
--- a/modules/configmake	Sun Oct 26 12:38:39 2008 +0100
+++ b/modules/configmake	Sun Oct 26 14:29:43 2008 +0100
@@ -61,7 +61,8 @@
 CLEANFILES += configmake.h configmake.h-t
 
 Include:
-"configmake.h"
+/* Include only after all system include files.  */
+#include "configmake.h"
 
 License:
 LGPLv2+