From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 8 Oct 2012 09:19:20 +0000 (+0200)
Subject: Temporary fix for changes in 2012-10-08T08:23:13Z!dancol@dancol.org.
X-Git-Tag: emacs-24.2.90~237^2~60
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ae3a8a712890fa8dd4223c4c68a9fe88b42a5c5;p=emacs.git

Temporary fix for changes in 2012-10-08T08:23:13Z!dancol@dancol.org.
---

diff --git a/src/image.c b/src/image.c
index 6fc459f0bbc..8139979bda9 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3240,13 +3240,13 @@ init_xpm_functions (void)
 
 #endif /* WINDOWSNT */
 
-#ifdef HAVE_NTGUI
+#if defined (HAVE_NTGUI) && !defined (WINDOWSNT)
 /* Glue for code below */
 #define fn_XpmReadFileToImage XpmReadFileToImage
 #define fn_XpmCreateImageFromBuffer XpmCreateImageFromBuffer
 #define fn_XImageFree XImageFree
 #define fn_XpmFreeAttributes XpmFreeAttributes
-#endif /* HAVE_NTGUI */
+#endif /* HAVE_NTGUI && !WINDOWSNT */
 
 /* Value is true if COLOR_SYMBOLS is a valid color symbols list
    for XPM images.  Such a list must consist of conses whose car and
@@ -6061,9 +6061,11 @@ jpeg_image_p (Lisp_Object object)
 #define __WIN32__ 1
 #endif
 
+#if 0	/* FIXME */
 /* Work around conflict between jpeg boolean and rpcndr.h
    under Windows. */
 #define boolean jpeg_boolean
+#endif
 #include <jpeglib.h>
 #include <jerror.h>