diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2020-11-20 17:00:36 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-11-20 17:00:36 +0200 |
| commit | 88adf1f0dd82866a81fae3338adcda735a499a63 (patch) | |
| tree | 3ad2ea29df41c4e5e4c4a0ca5369ee5a89bccc3c /src/image.c | |
| parent | b4b1bd6e03d739871dd3ba51e8de0be2d272b766 (diff) | |
| download | emacs-88adf1f0dd82866a81fae3338adcda735a499a63.tar.gz | |
Fix compilation on MS-Windows with librsvg > 2.46.0
* src/image.c (rsvg_handle_get_dimensions, init_svg_functions):
Make 'rsvg_handle_get_dimensions' available and defined for all
versions of librsvg. (Bug#44655)
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/image.c b/src/image.c index fdb7ef874d7..5eb41322950 100644 --- a/src/image.c +++ b/src/image.c @@ -9551,10 +9551,9 @@ DEF_DLL_FN (void, rsvg_handle_get_intrinsic_dimensions, DEF_DLL_FN (gboolean, rsvg_handle_get_geometry_for_layer, (RsvgHandle *, const char *, const RsvgRectangle *, RsvgRectangle *, RsvgRectangle *, GError **)); -# else +# endif DEF_DLL_FN (void, rsvg_handle_get_dimensions, (RsvgHandle *, RsvgDimensionData *)); -# endif DEF_DLL_FN (GdkPixbuf *, rsvg_handle_get_pixbuf, (RsvgHandle *)); DEF_DLL_FN (int, gdk_pixbuf_get_width, (const GdkPixbuf *)); DEF_DLL_FN (int, gdk_pixbuf_get_height, (const GdkPixbuf *)); @@ -9604,9 +9603,8 @@ init_svg_functions (void) #if LIBRSVG_CHECK_VERSION (2, 46, 0) LOAD_DLL_FN (library, rsvg_handle_get_intrinsic_dimensions); LOAD_DLL_FN (library, rsvg_handle_get_geometry_for_layer); -#else - LOAD_DLL_FN (library, rsvg_handle_get_dimensions); #endif + LOAD_DLL_FN (library, rsvg_handle_get_dimensions); LOAD_DLL_FN (library, rsvg_handle_get_pixbuf); LOAD_DLL_FN (gdklib, gdk_pixbuf_get_width); @@ -9644,9 +9642,8 @@ init_svg_functions (void) # if LIBRSVG_CHECK_VERSION (2, 46, 0) # undef rsvg_handle_get_intrinsic_dimensions # undef rsvg_handle_get_geometry_for_layer -# else -# undef rsvg_handle_get_dimensions # endif +# undef rsvg_handle_get_dimensions # undef rsvg_handle_get_pixbuf # if LIBRSVG_CHECK_VERSION (2, 32, 0) # undef g_file_new_for_path @@ -9677,9 +9674,8 @@ init_svg_functions (void) fn_rsvg_handle_get_intrinsic_dimensions # define rsvg_handle_get_geometry_for_layer \ fn_rsvg_handle_get_geometry_for_layer -# else -# define rsvg_handle_get_dimensions fn_rsvg_handle_get_dimensions # endif +# define rsvg_handle_get_dimensions fn_rsvg_handle_get_dimensions # define rsvg_handle_get_pixbuf fn_rsvg_handle_get_pixbuf # if LIBRSVG_CHECK_VERSION (2, 32, 0) # define g_file_new_for_path fn_g_file_new_for_path |