procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port LIBRSVG_CHECK_VERSION fix to picky cpp

Browse source 
* 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.
This commit is contained in:
Paul Eggert 2019-05-08 08:37:40 -07:00
parent 8b789755b4
commit caa28f031b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/image.c
View file

@ -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