Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
5023:838630c0734f 5024:7e57c0575a15
118 typedef unsigned char boolean; 118 typedef unsigned char boolean;
119 #endif 119 #endif
120 #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ 120 #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
121 #endif 121 #endif
122 122
123 /* Yet more breakage... jmorecfg.h unconditionally defines FAR either as
124 "far" or as blank. Windef.h unconditionally defines FAR as "far".
125 We'll avoid the compile warning by redefing FAR the way windows defines it,
126 after loading the JPEG headers. */
127 #undef FAR
123 #include <jpeglib.h> 128 #include <jpeglib.h>
124 #include <jerror.h> 129 #include <jerror.h>
130 #undef FAR
131 #define FAR far
125 132
126 END_C_DECLS 133 END_C_DECLS
127 134
128 /*#define USE_TEMP_FILES_FOR_JPEG_IMAGES 1*/ 135 /*#define USE_TEMP_FILES_FOR_JPEG_IMAGES 1*/
129 static void 136 static void