summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2009-06-06 19:46:48 +0000
committerJonathan Kew <jfkthame@googlemail.com>2009-06-06 19:46:48 +0000
commit6e5126ecb11bc51aa98b2a7d181f34fcc49c8b74 (patch)
treefc925b6986011bfb5b9f3a7bdba9a121815bd23e /Build
parent0c9168b562911cd6d5a9acc1345285b47e417413 (diff)
eliminate possibly-ambiguous override of SWAP
git-svn-id: svn://tug.org/texlive/trunk@13650 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp2
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXswap.h10
2 files changed, 1 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
index 8395003bdbc..96e17f40889 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr.cpp
@@ -584,7 +584,7 @@ XeTeXFontMgr::getOpSizeRecAndStyleFlags(Font* theFont)
const POSTTable* postTable = (const POSTTable*)getFontTablePtr(font, LE_POST_TABLE_TAG);
if (postTable != NULL) {
- theFont->slant = (int)(1000 * (tan(Fix2X(-SWAP(postTable->italicAngle)) * M_PI / 180.0)));
+ theFont->slant = (int)(1000 * (tan(Fix2X(-SWAP(UInt32(postTable->italicAngle))) * M_PI / 180.0)));
}
deleteFont(font);
}
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXswap.h b/Build/source/texk/web2c/xetexdir/XeTeXswap.h
index 311b8a791f8..18cccf3722f 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXswap.h
+++ b/Build/source/texk/web2c/xetexdir/XeTeXswap.h
@@ -58,16 +58,6 @@ SWAP32(const UInt32 p)
}
#ifdef __cplusplus
-
-#ifdef XETEX_MAC
-#include "sfnt.h" /* for the 'fixed' typedef */
-static inline fixed
-SWAP(fixed p)
-{
- return (fixed)SWAP32((UInt32)p);
-}
-#endif
-
static inline UInt16
SWAP(UInt16 p)
{