summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/texmfmp.h6
2 files changed, 10 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 9ab30bf29d3..107112cd576 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-27 Khaled Hosny <khaledhosny@eglug.org>
+
+ * texmfmp.h [XeTeX]: Temporary fix for building with Clang on Mac.
+
2013-03-26 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Drop duplicate KPSE_XPDF_FLAGS.
diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h
index 208a5c08774..0f261619226 100644
--- a/Build/source/texk/web2c/texmfmp.h
+++ b/Build/source/texk/web2c/texmfmp.h
@@ -7,6 +7,12 @@
#include <kpathsea/tex-make.h> /* for kpse_make_tex_discard_errors */
#ifdef XeTeX
+#ifdef XETEX_MAC
+/* include this here to avoid conflict between clang's emmintrin.h and
+ * texmfmem.h. Should be removed once a fixed clang is widely available
+ * http://llvm.org/bugs/show_bug.cgi?id=14964 */
+#include <ApplicationServices/ApplicationServices.h>
+#endif
/* added typedefs for unicodefile and voidpointer */
#define XETEX_UNICODE_FILE_DEFINED 1
typedef struct {