diff options
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 45b92e8ab53..0f566bb703e 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,9 @@ +2012-03-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + * XeTeX_ext.c, xetex.h (Byte): Remove temporary #define to my_Byte + and subsequent #undef. The typedef conflict between TECkit_Common.h + and zlib is now handled differently (by zlib and TECkit). + 2012-03-16 Peter Breitenlohner <peb@mppmu.mpg.de> * XeTeXGrLayout.h: Declare XeTeXGrTextSource::featureVariations() diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index fa0c0a7b693..74821d63204 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -46,9 +46,7 @@ authorization from the copyright holders. #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 */ diff --git a/Build/source/texk/web2c/xetexdir/xetex.h b/Build/source/texk/web2c/xetexdir/xetex.h index c88942d222f..4e31510a629 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.h +++ b/Build/source/texk/web2c/xetexdir/xetex.h @@ -105,7 +105,5 @@ 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/TECkit_Common.h> /* include this before XeTeX_ext.h */ -#undef Byte #include "XeTeX_ext.h" /* other extension functions */ |