From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 23 Dec 2004 16:16:14 +0000 (+0000)
Subject: (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
X-Git-Tag: ttn-vms-21-2-B4~3171
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66354420ae890d5581395f62d66b3decb007786e;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8d09c5bfd2f..5030c115d35 100644
--- 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 18ffc2db3a4..6a86708a9d7 100644
--- 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>