mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00
Code Issues Projects Releases Wiki Activity

Avoid compilation warnings in image.c.

Browse source 
src/image.c (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE): Move back
 after inclusion of gif_lib.h, thus fixing compiler warnings caused
 by 2013-10-10T19:15:33Z!eggert@cs.ucla.edu.
This commit is contained in:
Eli Zaretskii 2013-10-12 11:48:31 +03:00
parent 1b12c797ae
commit 567f95ecac
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2013-10-12 Eli Zaretskii <eliz@gnu.org>
* image.c (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE): Move back
after inclusion of gif_lib.h, thus fixing compiler warnings caused
by 2013-10-10T19:15:33Z!eggert@cs.ucla.edu.
2013-10-11 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (deep_copy_glyph_row): Handle the case that FROM and TO

26
src/image.c
View file

@ -7203,21 +7203,8 @@ gif_image_p (Lisp_Object object)
#ifdef HAVE_GIF
/* Giflib before 5.0 didn't define these macros. */
#ifndef GIFLIB_MAJOR
#define GIFLIB_MAJOR 4
#endif
#if defined (HAVE_NTGUI)
/* Giflib before 5.0 didn't define these macros (used only if HAVE_NTGUI). */
#ifndef GIFLIB_MINOR
#define GIFLIB_MINOR 0
#endif
#ifndef GIFLIB_RELEASE
#define GIFLIB_RELEASE 0
#endif
/* winuser.h might define DrawText to DrawTextA or DrawTextW.
Undefine before redefining to avoid a preprocessor warning. */
#ifdef DrawText
@ -7228,12 +7215,25 @@ gif_image_p (Lisp_Object object)
#include <gif_lib.h>
#undef DrawText
/* Giflib before 5.0 didn't define these macros (used only if HAVE_NTGUI). */
#ifndef GIFLIB_MINOR
#define GIFLIB_MINOR 0
#endif
#ifndef GIFLIB_RELEASE
#define GIFLIB_RELEASE 0
#endif
#else /* HAVE_NTGUI */
#include <gif_lib.h>
#endif /* HAVE_NTGUI */
/* Giflib before 5.0 didn't define these macros. */
#ifndef GIFLIB_MAJOR
#define GIFLIB_MAJOR 4
#endif
#ifdef WINDOWSNT
/* GIF library details. */