From 66354420ae890d5581395f62d66b3decb007786e Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Thu, 23 Dec 2004 16:16:14 +0000 Subject: [PATCH] (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library. --- src/ChangeLog | 5 +++++ src/image.c | 6 ++++++ 2 files changed, 11 insertions(+) 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 + + * image.c (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour + of JPEG library. + 2004-12-22 Richard M. Stallman * 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 #include #include -- 2.39.2