[Emacs-diffs] trunk r114614: * image.c: Pacify --enable-gcc-warnings.

[Paul Eggert]

------------------------------------------------------------
revno: 114614
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-10 12:15:33 -0700
message:
  * image.c: Pacify --enable-gcc-warnings.
  
  (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE, fn_GifErrorString):
  #define only if used.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-10 15:30:21 +0000
+++ b/src/ChangeLog     2013-10-10 19:15:33 +0000
@@ -1,3 +1,9 @@
+2013-10-10  Paul Eggert  <address@hidden>
+
+       * image.c: Pacify --enable-gcc-warnings.
+       (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE, fn_GifErrorString):
+       #define only if used.
+
 2013-10-10  Eli Zaretskii  <address@hidden>
 
        * image.c (GIFLIB_MAJOR): Define to 4 if undefined.

=== modified file 'src/image.c'
--- a/src/image.c       2013-10-10 15:30:21 +0000
+++ b/src/image.c       2013-10-10 19:15:33 +0000
@@ -7203,7 +7203,21 @@
 
 #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
@@ -7220,17 +7234,6 @@
 
 #endif /* HAVE_NTGUI */
 
-/* Giflib before 5.0 didn't define these macros.  */
-#ifndef GIFLIB_MAJOR
-#define GIFLIB_MAJOR 4
-#endif
-#ifndef GIFLIB_MINOR
-#define GIFLIB_MINOR 0
-#endif
-#ifndef GIFLIB_RELEASE
-#define GIFLIB_RELEASE 0
-#endif
-
 #ifdef WINDOWSNT
 
 /* GIF library details.  */
@@ -7269,7 +7272,9 @@
 #define fn_DGifSlurp           DGifSlurp
 #define fn_DGifOpen            DGifOpen
 #define fn_DGifOpenFileName    DGifOpenFileName
-#define fn_GifErrorString      GifErrorString
+#if 5 <= GIFLIB_MAJOR
+# define fn_GifErrorString     GifErrorString
+#endif
 
 #endif /* WINDOWSNT */