diff options
| author | Karl Berry <karl@freefriends.org> | 2008-04-11 16:41:14 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2008-04-11 16:41:14 +0000 |
| commit | cd2bd80c32376c7af756da7ed6f377ad2577650c (patch) | |
| tree | e984cbe1618211523fcf392ec7ba354e944c5c19 /Build | |
| parent | 047070d4ddd52fec36d80da93125b44e736c4b7c (diff) | |
(Byte): #define to my_Byte and then #undef to avoid typedef
conflict between TECkit_Common.h and zlib; sigh.
git-svn-id: svn://tug.org/texlive/trunk@7378 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/xetexdir/xetex.h b/Build/source/texk/web2c/xetexdir/xetex.h index b81ec543d0c..a7282d07881 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.h +++ b/Build/source/texk/web2c/xetexdir/xetex.h @@ -93,5 +93,7 @@ void* getotassemblyptr(int f, int g, int horiz); /* function in XeTeXOTMath.cpp #endif #include "trans.h" /* functions for affine transform operations */ +#define Byte my_Byte /* hack to work around typedef conflict with zlib */ #include "TECkit_Common.h" /* include this before XeTeX_ext.h */ +#undef Byte #include "XeTeX_ext.h" /* other extension functions */ |