From 8d88a7c56c0ec28e74131518d5dbffcb1902b9ff Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Wed, 21 Nov 2007 13:44:21 +0000 Subject: patch to fix compile error (typedef conflict) git-svn-id: svn://tug.org/texlive/trunk@5539 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Build/source/texk/web2c') 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 #include FT_FREETYPE_H -#include "zlib.h" - #include "TECkit_Engine.h" #include -- cgit v1.2.3