summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir/xetex.h
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2010-06-13 11:58:21 +0000
committerJonathan Kew <jfkthame@googlemail.com>2010-06-13 11:58:21 +0000
commit7ef66445c67a38eae29a96876837a3bbbb6897cc (patch)
treeb19ade390c1552db84c0144327b1c3d36244de64 /Build/source/texk/web2c/xetexdir/xetex.h
parent92eecf464fadcf5935e6a001b2bc549564451a50 (diff)
mac-only compatibility/portability fixes
git-svn-id: svn://tug.org/texlive/trunk@18933 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/xetex.h')
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.h2
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 ce149b221f0..c88942d222f 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.h
+++ b/Build/source/texk/web2c/xetexdir/xetex.h
@@ -99,6 +99,8 @@ void* getotassemblyptr(int f, int g, int horiz); /* function in XeTeXOTMath.cpp
#define Xchr(x) (x)
#ifdef XETEX_MAC
+#undef input /* this is defined in texmfmp.h, but we don't need it and it confuses the carbon headers */
+#undef output
#include <Carbon/Carbon.h> /* for Mac OS X, it's handy to have the Carbon APIs available */
#endif