diff options
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 0da0059817e..5668fddba85 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,7 @@ +2015-05-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * XeTeX_ext.c: Can not use non-locking getc() for MinGW. + 2015-05-03 Jonathan Kew <jfkthame@gmail.com> * XeTeX_ext.c: use non-locking getc() for faster file reading. diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index 7e16fb169da..4b9bc946e5a 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -91,8 +91,14 @@ authorization from the copyright holders. /* for reading input files, we don't need the default locking routines as xetex is a single-threaded program */ #ifdef WIN32 +#ifdef __MINGW32__ +/* MinGW (both 32- and 64-bit) has problems with _getc_nolock() and/or _ungetc_nolock() */ +#define GETC(f) getc(f) +#define UNGETC(c,f) ungetc(c,f) +#else #define GETC(f) _getc_nolock(f) #define UNGETC(c,f) _ungetc_nolock(c,f) +#endif #else #define GETC(f) getc_unlocked(f) #define UNGETC(c,f) ungetc(c,f) |