diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2012-03-25 17:03:56 +0000 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2012-03-25 17:03:56 +0000 |
commit | faadaac35c4c8723dcd38bd67cfabefadd912073 (patch) | |
tree | 6633c69bb9215fb5df167caeee3bbef7f1684dfc /Build/source/texk/web2c/xetexdir/XeTeX_ext.h | |
parent | e76f520021de528b223eeb679ba35435110872c3 (diff) |
Merge changes from XeTeX repository
git-svn-id: svn://tug.org/texlive/trunk@25739 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeX_ext.h')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeX_ext.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h index 7818aa4b3ca..10b60139990 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h @@ -313,6 +313,15 @@ typedef void* ATSUStyle; /* dummy declaration just so the stubs can compile */ void atsugetfontmetrics(ATSUStyle style, integer* ascent, integer* descent, integer* xheight, integer* capheight, integer* slant); #ifdef XETEX_MAC + +#if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7) + #include <ApplicationServices/ApplicationServices.h> + /* These functions have been removed on 10.7; as a workaround, just do + * a cast as the ATSFontRef and ATSUFontID should have the same value... */ + #define FMGetFontFromATSFontRef(x) ((ATSUFontID) x) + #define FMGetATSFontRefFromFont(x) ((ATSFontRef) x) +#endif + /* functions in XeTeX_mac.c */ void* loadAATfont(ATSFontRef fontRef, integer scaled_size, const char* cp1); void DoAtsuiLayout(void* node, int justify); |