From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 29 Oct 2021 19:07:27 +0000 (+0300)
Subject: ; Fix a recent change in image.c
X-Git-Tag: emacs-29.0.90~3671^2~351
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3499b8ddc357544a58917bfd3846f88caf5d97c;p=emacs.git

; Fix a recent change in image.c

* src/image.c (DGifSavedExtensionToGCB): Define only for GIFLIB >= 5.
---

diff --git a/src/image.c b/src/image.c
index 6ab9670e4b0..1c31bdd3d95 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8277,8 +8277,8 @@ DEF_DLL_FN (GifFileType *, DGifOpenFileName, (const char *));
 #  else
 DEF_DLL_FN (GifFileType *, DGifOpen, (void *, InputFunc, int *));
 DEF_DLL_FN (GifFileType *, DGifOpenFileName, (const char *, int *));
-DEF_DLL_FN (int, DGifSavedExtensionToGCB, (GifFileType *, int,
-					   GraphicsControlBlock *));
+DEF_DLL_FN (int, DGifSavedExtensionToGCB,
+	    (GifFileType *, int, GraphicsControlBlock *));
 #  endif
 #  if HAVE_GIFERRORSTRING
 DEF_DLL_FN (char const *, GifErrorString, (int));
@@ -8309,14 +8309,18 @@ init_gif_functions (void)
 #  undef DGifOpen
 #  undef DGifOpenFileName
 #  undef DGifSlurp
-#  undef DGifSavedExtensionToGCB
+#  if GIFLIB_MAJOR >= 5
+#   undef DGifSavedExtensionToGCB
+#  endif
 #  undef GifErrorString
 
 #  define DGifCloseFile fn_DGifCloseFile
 #  define DGifOpen fn_DGifOpen
 #  define DGifOpenFileName fn_DGifOpenFileName
 #  define DGifSlurp fn_DGifSlurp
-#  define DGifSavedExtensionToGCB fn_DGifSavedExtensionToGCB
+#  if GIFLIB_MAJOR >= 5
+#   define DGifSavedExtensionToGCB fn_DGifSavedExtensionToGCB
+#  endif
 #  define GifErrorString fn_GifErrorString
 
 # endif /* WINDOWSNT */