summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index d9904176d7e..979e211fa9e 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -37,8 +37,12 @@ authorization from SIL International.
#include "png.h"
#endif
+#include "zlib.h"
+
#define EXTERN extern
+#define Byte my_Byte /* hack to work around typedef conflict with zlib */
#include "xetexd.h"
+#undef Byte
#ifdef XETEX_MAC
#undef input /* this is defined in texmfmp.h, but we don't need it and it confuses the carbon headers */
@@ -50,8 +54,6 @@ authorization from SIL International.
#include <ft2build.h>
#include FT_FREETYPE_H
-#include "zlib.h"
-
#include "TECkit_Engine.h"
#include <kpathsea/c-ctype.h>