Mercurial > hg > xemacs-beta
comparison src/glyphs-eimage.c @ 4326:a5ff7e67ac1b
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
2007-12-11 Aidan Kehoe <kehoea@parhasard.net>
* glyphs-eimage.c:
Merge Ron Isaacson's patch of
3ggprxj7ifh.wl_Ron.Isaacson@morganstanley.com , originally from
Gennady Khokhorin. Prevents library incompatibilities on Win32.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 12 Dec 2007 00:42:48 +0100 |
| parents | 320acec37716 |
| children | 6c6bfdb80a0c |
comparison
equal
deleted
inserted
replaced
| 4325:948c9b232595 | 4326:a5ff7e67ac1b |
|---|---|
| 107 typedefs the way that <windows.h> wants them (which is more correct, | 107 typedefs the way that <windows.h> wants them (which is more correct, |
| 108 anyway; jmorecfg.h defines INT32 as `long'). */ | 108 anyway; jmorecfg.h defines INT32 as `long'). */ |
| 109 #define XMD_H | 109 #define XMD_H |
| 110 typedef signed int INT32; | 110 typedef signed int INT32; |
| 111 typedef signed short INT16; | 111 typedef signed short INT16; |
| 112 | |
| 113 /* And another one... jmorecfg.h defines the 'boolean' type as int, | |
| 114 which conflicts with the standard Windows 'boolean' definition as | |
| 115 unsigned char. Ref: http://www.asmail.be/msg0054688232.html */ | |
| 116 #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ | |
| 117 typedef unsigned char boolean; | |
| 118 #endif | |
| 119 #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ | |
| 112 #endif | 120 #endif |
| 113 | 121 |
| 114 #include <jpeglib.h> | 122 #include <jpeglib.h> |
| 115 #include <jerror.h> | 123 #include <jerror.h> |
| 116 | 124 |