From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 8 May 2019 15:37:40 +0000 (-0700)
Subject: Port LIBRSVG_CHECK_VERSION fix to picky cpp
X-Git-Tag: emacs-27.0.90~2936
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=caa28f031b65ff6512e777f8996d7f3c3144c17a;p=emacs.git

Port LIBRSVG_CHECK_VERSION fix to picky cpp

* src/image.c (LIBRSVG_CHECK_VERSION): Define to yield false
if it isn’t already defined.
(svg_load_image): Port to C preprocessors that check the
syntax of the entire preprocessing expression before
evaluating any of it.
---

diff --git a/src/image.c b/src/image.c
index 725eb4b8d09..e8cb4341773 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9248,6 +9248,11 @@ svg_image_p (Lisp_Object object)
 
 # include <librsvg/rsvg.h>
 
+/* librsvg is too old for us if it doesn't define this macro.  */
+# ifndef LIBRSVG_CHECK_VERSION
+#  define LIBRSVG_CHECK_VERSION(v, w, x) false
+# endif
+
 # ifdef WINDOWSNT
 
 /* Restore the original definition of __MINGW_MAJOR_VERSION.  */
@@ -9465,8 +9470,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
   #if GNUC_PREREQ (4, 6, 0)
    #pragma GCC diagnostic push
   #endif
-  #if defined LIBRSVG_CHECK_VERSION && LIBRSVG_CHECK_VERSION (2, 45, 1) \
-    && GNUC_PREREQ (4, 2, 0)
+  #if LIBRSVG_CHECK_VERSION (2, 45, 1) && GNUC_PREREQ (4, 2, 0)
    #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   #endif