Mercurial > hg > xemacs-beta

diff src/glyphs-eimage.c @ 5024:7e57c0575a15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Tue, 09 Feb 2010 19:34:19 -0600
parents 2ade80e8c640 2eec7322eb7f
children 6c6d78781d59 8b2f75cecb89
line wrap: on
line diff
--- a/src/glyphs-eimage.c	Tue Feb 09 19:13:44 2010 -0600
+++ b/src/glyphs-eimage.c	Tue Feb 09 19:34:19 2010 -0600
@@ -120,8 +120,15 @@
 #define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
 #endif
 
+/* Yet more breakage... jmorecfg.h unconditionally defines FAR either as
+   "far" or as blank.  Windef.h unconditionally defines FAR as "far".
+   We'll avoid the compile warning by redefing FAR the way windows defines it,
+   after loading the JPEG headers. */
+#undef FAR
 #include <jpeglib.h>
 #include <jerror.h>
+#undef FAR
+#define FAR far
 
 END_C_DECLS