summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2007-11-21 13:44:21 +0000
committerJonathan Kew <jfkthame@googlemail.com>2007-11-21 13:44:21 +0000
commit8d88a7c56c0ec28e74131518d5dbffcb1902b9ff (patch)
tree94d850bd0edfaa085af5e86b07d3f7cd1891ac6b /Build
parent4b8d7001923647636c75949b21bea08220c444fa (diff)
patch to fix compile error (typedef conflict)
git-svn-id: svn://tug.org/texlive/trunk@5539 c570f23f-e606-0410-a88d-b1316a301751
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>