changeset: 4326:a5ff7e67ac1b2d4db44559970e77bf9391453b79
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Wed Dec 12 00:42:48 2007 +0100
files: src/ChangeLog src/glyphs-eimage.c
description:
Don't let libtiff override the size of a boolean, Win32. From Ron Isaacson.
2007-12-11 Aidan Kehoe <kehoea(a)parhasard.net>
* glyphs-eimage.c:
Merge Ron Isaacson's patch of
3ggprxj7ifh.wl_Ron.Isaacson(a)morganstanley.com , originally from
Gennady Khokhorin. Prevents library incompatibilities on Win32.
diff -r 948c9b232595f4a24f2982bf072432030810a0a5 -r
a5ff7e67ac1b2d4db44559970e77bf9391453b79 src/ChangeLog
--- 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@parhasa
+2007-12-11 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * glyphs-eimage.c:
+ Merge Ron Isaacson's patch of
+ 3ggprxj7ifh.wl_Ron.Isaacson(a)morganstanley.com , originally from
+ Gennady Khokhorin. Prevents library incompatibilities on Win32.
+
2007-12-11 Aidan Kehoe <kehoea(a)parhasard.net>
* fileio.c (Fsubstitute_in_file_name):
diff -r 948c9b232595f4a24f2982bf072432030810a0a5 -r
a5ff7e67ac1b2d4db44559970e77bf9391453b79 src/glyphs-eimage.c
--- 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 @@ BEGIN_C_DECLS
#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>
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches