diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-09-18 13:49:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-09-18 13:49:33 +0300 |
| commit | ae97707fa29a4413d23d44402dbe7dacb6e4f09a (patch) | |
| tree | abe464f759308bc1139459f669ab1c3d80000c3f /nt | |
| parent | 9d83259abdec8e6e311b675669bc146e74ff8fb8 (diff) | |
| download | emacs-ae97707fa29a4413d23d44402dbe7dacb6e4f09a.tar.gz | |
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.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rwxr-xr-x | nt/configure.bat | 5 |
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
|