diff options
| author | Miles Bader | 2005-06-09 07:13:03 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-06-09 07:13:03 +0000 |
| commit | d113efea8e0a56aedd60615f5dc6669c72aca77f (patch) | |
| tree | c51aa1cd5076acfc2391217b0d7dea96552011de /src/image.c | |
| parent | 2435213ba6b74f7425e15b1f799c9ae18467e43d (diff) | |
| parent | 47600d8e97925ed8816b099267e24f4ab3311e75 (diff) | |
| download | emacs-d113efea8e0a56aedd60615f5dc6669c72aca77f.tar.gz emacs-d113efea8e0a56aedd60615f5dc6669c72aca77f.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-61
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 353-357)
- Update from CVS
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/image.c b/src/image.c index 15e835fef3b..bc88c9d1d04 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -6265,8 +6265,8 @@ jpeg_image_p (object) | |||
| 6265 | #endif /* HAVE_STLIB_H */ | 6265 | #endif /* HAVE_STLIB_H */ |
| 6266 | 6266 | ||
| 6267 | #if defined (HAVE_NTGUI) && !defined (__WIN32__) | 6267 | #if defined (HAVE_NTGUI) && !defined (__WIN32__) |
| 6268 | /* jpeglib.h will define boolean differently depending on __WIN32__, | 6268 | /* In older releases of the jpeg library, jpeglib.h will define boolean |
| 6269 | so make sure it is defined. */ | 6269 | differently depending on __WIN32__, so make sure it is defined. */ |
| 6270 | #define __WIN32__ 1 | 6270 | #define __WIN32__ 1 |
| 6271 | #endif | 6271 | #endif |
| 6272 | 6272 | ||