(__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8d09c5bfd2fae219f27da6cba4140cef989e4b1d..5030c115d35f026aa5b11898c1049e59687be7a9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-23  Jason Rumney  <jasonr@gnu.org>
+
+       * image.c (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour
+       of JPEG library.
+
 2004-12-22  Richard M. Stallman  <rms@gnu.org>
 
        * emacs.c (main): If batch mode, set Vundo_outer_limit to nil.

diff --git a/src/image.c b/src/image.c
index 18ffc2db3a466b0a59dd2fac5687b7c647499836..6a86708a9d717359f0e7cf5e46502c8f46fda4b2 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -6269,6 +6269,12 @@ jpeg_image_p (object)
 #undef HAVE_STDLIB_H
 #endif /* HAVE_STLIB_H */
 
+#if defined (HAVE_NTGUI) && !defined (__WIN32__)
+/* jpeglib.h will define boolean differently depending on __WIN32__,
+   so make sure it is defined.  */
+#define __WIN32__ 1
+#endif
+
 #include <jpeglib.h>
 #include <jerror.h>
 #include <setjmp.h>