From 33d4113cf5da783b5b1ab559587640f39a0831dc Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sun, 14 Oct 2012 15:25:37 -0800 Subject: [PATCH] * image.c (init_tiff_functions, init_imagemagick_functions) (init_svg_functions): Fix cygw32 build break by using these functions only when WINDOWSNT _and_ HAVE_NTGUI. --- src/ChangeLog | 6 ++++++ src/image.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0b3d02f75a..bb7ddcfd39 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-10-14 Daniel Colascione + + * image.c (init_tiff_functions, init_imagemagick_functions) + (init_svg_functions): Fix cygw32 build break by using these + functions only when WINDOWSNT _and_ HAVE_NTGUI. + 2012-10-14 Jan Djärv * nsterm.m (ns_select): Count fd:s in writefs also (Bug#12422). diff --git a/src/image.c b/src/image.c index d52c3a29a2..538ae2b777 100644 --- a/src/image.c +++ b/src/image.c @@ -6577,7 +6577,7 @@ static const struct image_keyword tiff_format[TIFF_LAST] = {":index", IMAGE_NON_NEGATIVE_INTEGER_VALUE, 0} }; -#ifdef HAVE_NTGUI +#if defined HAVE_NTGUI && defined WINDOWSNT static bool init_tiff_functions (void); #else #define init_tiff_functions NULL @@ -7529,7 +7529,7 @@ static struct image_keyword imagemagick_format[IMAGEMAGICK_LAST] = {":crop", IMAGE_DONT_CHECK_VALUE_TYPE, 0} }; -#ifdef HAVE_NTGUI +#if defined HAVE_NTGUI && defined WINDOWSNT static bool init_imagemagick_functions (void); #else #define init_imagemagick_functions NULL @@ -8083,7 +8083,7 @@ static const struct image_keyword svg_format[SVG_LAST] = {":background", IMAGE_STRING_OR_NIL_VALUE, 0} }; -#ifdef HAVE_NTGUI +#if defined HAVE_NTGUI && defined WINDOWSNT static bool init_svg_functions (void); #else #define init_svg_functions NULL -- 2.20.1