summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 954766c5b5a..0a79748aa05 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * XeTeX_ext.c [MINGW32]: First #include <kpathsea/config.h> to
+ avoid conflicting eof() declarations.
+
2010-02-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* pngimage.c (check_for_png): Replace png_check_sig() by
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index 87890d6ab5d..d06f83748d6 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -34,6 +34,10 @@ authorization from the copyright holders.
* additional plain C extensions for XeTeX - mostly platform-neutral
*/
+/* We must include this first to avoid conflicting eof() declarations
+ from mingw32's <io.h> and web2c/lib/lib.h. */
+#include <kpathsea/config.h>
+
#ifdef XETEX_OTHER
#ifdef POPPLER_VERSION
#define xpdfVersion POPPLER_VERSION