2 files changed, 9 insertions, 1 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 106f0e91695..311a10f66c5 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * 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  <lekktu@gmail.com>
 
         * config.nt: Sync with autogen/config.in.
diff --git a/nt/configure.bat b/nt/configure.bat
index 5890b12d02e..7fedff411bc 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 ^<stddef.h^> >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