[Emacs-diffs] master caa28f0: Port LIBRSVG_CHECK_VERSION fix to picky cpp

[Paul Eggert]

branch: master
commit caa28f031b65ff6512e777f8996d7f3c3144c17a
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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.
---
 src/image.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/image.c b/src/image.c
index 725eb4b..e8cb434 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