From 4d45d1e67873d2988c923aa182c26e4d6cfe0d0e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 26 Oct 2008 14:29:43 +0100 Subject: [PATCH] Fix a clash between the type DATADIR on Windows and the macro DATADIR. --- ChangeLog | 8 ++++++++ lib/javaversion.c | 6 +++--- modules/configmake | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4c475c45..67c5f820e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-10-26 Bruno Haible + 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 + * m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Set default of HAVE_STRUCT_RANDOM_DATA to 1. (gl_STDLIB_H): Simplify. diff --git a/lib/javaversion.c b/lib/javaversion.c index 003919e79..94a353a0f 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 a1169a933..5160128e6 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+ -- 2.11.0