[Emacs-diffs] trunk r114634: Avoid compilation warnings in image.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114634
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-10-12 11:48:31 +0300
message:
  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 revision 114614 (commit of 2013-10-10).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-11 15:42:06 +0000
+++ b/src/ChangeLog     2013-10-12 08:48:31 +0000
@@ -1,3 +1,9 @@
+2013-10-12  Eli Zaretskii  <address@hidden>
+
+       * image.c (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE): Move back
+       after inclusion of gif_lib.h, thus fixing compiler warnings caused
+       by revision 114614 (commit of 2013-10-10).
+
 2013-10-11  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (deep_copy_glyph_row): Handle the case that FROM and TO

=== modified file 'src/image.c'
--- a/src/image.c       2013-10-11 06:32:29 +0000
+++ b/src/image.c       2013-10-12 08:48:31 +0000
@@ -7203,13 +7203,18 @@
 
 #ifdef HAVE_GIF
 
-/* Giflib before 5.0 didn't define these macros.  */
-#ifndef GIFLIB_MAJOR
-#define GIFLIB_MAJOR 4
-#endif
-
 #if defined (HAVE_NTGUI)
 
+/* winuser.h might define DrawText to DrawTextA or DrawTextW.
+   Undefine before redefining to avoid a preprocessor warning.  */
+#ifdef DrawText
+#undef DrawText
+#endif
+/* avoid conflict with QuickdrawText.h */
+#define DrawText gif_DrawText
+#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
@@ -7218,22 +7223,17 @@
 #define GIFLIB_RELEASE 0
 #endif
 
-/* winuser.h might define DrawText to DrawTextA or DrawTextW.
-   Undefine before redefining to avoid a preprocessor warning.  */
-#ifdef DrawText
-#undef DrawText
-#endif
-/* avoid conflict with QuickdrawText.h */
-#define DrawText gif_DrawText
-#include <gif_lib.h>
-#undef DrawText
-
 #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.  */