summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2007-01-13 20:27:43 +0000
committerJonathan Kew <jfkthame@googlemail.com>2007-01-13 20:27:43 +0000
commitd13366745921431c4e5321d8b1e85169f0e928f6 (patch)
tree5b7ae731d09b9d0473429e6e06add0af50449230 /Build/source/texk/web2c/xetexdir
parentf4828d021465a0001df4135ca9e0bd1d13b9f41b (diff)
workaround for zlib & teckit Byte typedef clash
git-svn-id: svn://tug.org/texlive/trunk@3433 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeX_ext.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
index e1c9ef94648..977c253c6bb 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c
@@ -38,7 +38,9 @@ authorization from SIL International.
#endif
#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 */