From ae97707fa29a4413d23d44402dbe7dacb6e4f09a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 18 Sep 2012 13:49:33 +0300 Subject: [PATCH] Fix bug #12464 with test for giflib 5.0.0 on MS-Windows. nt/configure.bat: Include stddef.h before gif_lib.h, to have size_t defined, as needed by giflib-5.0.0. --- nt/ChangeLog | 5 +++++ nt/configure.bat | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 106f0e9169..311a10f66c 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2012-09-18 Eli Zaretskii + + * configure.bat: Include stddef.h before gif_lib.h, to have size_t + defined, as needed by giflib-5.0.0. (Bug#12464) + 2012-09-17 Juanma Barranquero * config.nt: Sync with autogen/config.in. diff --git a/nt/configure.bat b/nt/configure.bat index 5890b12d02..7fedff411b 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -627,7 +627,10 @@ rm -f junk.c junk.obj if (%gifsupport%) == (N) goto gifDone echo Checking for libgif... -echo #include "gif_lib.h" >junk.c +rem giflib-5.0.0 needs size_t defined before gif_lib.h is included +rem redirection characters need to be protected from the shell +echo #include ^ >junk.c +echo #include "gif_lib.h" >>junk.c echo main (){} >>junk.c rem -o option is ignored with cl, but allows result to be consistent. echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log -- 2.20.1