Avoid compilation warnings in image.c.

 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index faf6724b7df2b2b20307d070591566a7f7b67f40..83f6b3337db709ca8b60b8ec65210c0503533aca 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/image.c b/src/image.c
index ca2ef67c0b937ca6e31ef3d7b950760de5baf80e..bb3290a89f60ec82aafea84961a2215ded673479 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -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.  */