[Emacs-diffs] /srv/bzr/emacs/trunk r110548: * image.c (init_tiff_functions, init_imagemagick_functions)

[Daniel Colascione]

------------------------------------------------------------
revno: 110548
committer: Daniel Colascione <address@hidden>
branch nick: cyg
timestamp: Sun 2012-10-14 15:25:37 -0800
message:
  * 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.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-14 18:28:48 +0000
+++ b/src/ChangeLog     2012-10-14 23:25:37 +0000
@@ -1,3 +1,9 @@
+2012-10-14  Daniel Colascione  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsterm.m (ns_select): Count fd:s in writefs also (Bug#12422).

=== modified file 'src/image.c'
--- a/src/image.c       2012-10-13 00:52:01 +0000
+++ b/src/image.c       2012-10-14 23:25:37 +0000
@@ -6577,7 +6577,7 @@
   {":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 @@
     {":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 @@
   {":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