[Emacs-diffs] /srv/bzr/emacs/trunk r110445: Temporary fix for changes in revno 110444.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110445
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 11:19:20 +0200
message:
  Temporary fix for changes in revno 110444.
modified:
  src/image.c

=== modified file 'src/image.c'
--- a/src/image.c       2012-10-07 22:31:58 +0000
+++ b/src/image.c       2012-10-08 09:19:20 +0000
@@ -3240,13 +3240,13 @@
 
 #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 @@
 #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>