* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b3d02f75acfa4ae82a19968f5f6ddba8edaad4e..bb7ddcfd39e41feaedf65060e950e95ab575a231 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-14  Daniel Colascione  <dancol@dancol.org>
+
+       * 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  <jan.h.d@swipnet.se>
 
        * nsterm.m (ns_select): Count fd:s in writefs also (Bug#12422).

diff --git a/src/image.c b/src/image.c
index d52c3a29a27f53034cae4f4b5b6a9ee381c10d30..538ae2b77723c54ba3b5774517d2b4489c84c695 100644 (file)
--- 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