Mercurial > hg > octave-lyh > gnulib-hg
changeset 10722:7c9d441b72fc
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 | d0bb9c6b8b00 |
children | 607e3c5b1510 |
files | ChangeLog lib/javaversion.c modules/configmake |
diffstat | 3 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 {