Mercurial > hg > xemacs-beta
changeset 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 | 948c9b232595 |
| children | 466ad8ad5f13 |
| files | src/ChangeLog src/glyphs-eimage.c |
| diffstat | 2 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Dec 11 21:56:18 2007 +0100 +++ b/src/ChangeLog Wed Dec 12 00:42:48 2007 +0100 @@ -1,3 +1,10 @@ +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. + 2007-12-11 Aidan Kehoe <kehoea@parhasard.net> * fileio.c (Fsubstitute_in_file_name):
--- a/src/glyphs-eimage.c Tue Dec 11 21:56:18 2007 +0100 +++ b/src/glyphs-eimage.c Wed Dec 12 00:42:48 2007 +0100 @@ -109,6 +109,14 @@ #define XMD_H typedef signed int INT32; typedef signed short INT16; + +/* And another one... jmorecfg.h defines the 'boolean' type as int, + which conflicts with the standard Windows 'boolean' definition as + unsigned char. Ref: http://www.asmail.be/msg0054688232.html */ +#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */ +typedef unsigned char boolean; +#endif +#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ #endif #include <jpeglib.h>