summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-17 11:00:59 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-17 11:00:59 +0000
commit87f94469e917f9fa8e90af35d880daeb7f38ec01 (patch)
tree608c6b5e41776ac9e1169ae5ef90d7408819a2d8 /Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
parentf305bb496368b3e6c556c84f85d76e22014640c3 (diff)
pdfTeX, XeTeX: Avoid extern decls in C/C++ code, Kpathsea and w2c headers are C++ safe
git-svn-id: svn://tug.org/texlive/trunk@33203 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp')
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
index c3e3b7d1b5d..6eae6dbe5d6 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXLayoutInterface.cpp
@@ -2,7 +2,7 @@
Part of the XeTeX typesetting system
Copyright (c) 1994-2008 by SIL International
Copyright (c) 2009-2012 by Jonathan Kew
- Copyright (c) 2012, 2013 by Khaled Hosny
+ Copyright (c) 2012-2014 by Khaled Hosny
SIL Author(s): Jonathan Kew
@@ -31,13 +31,7 @@ use or other dealings in this Software without prior written
authorization from the copyright holders.
\****************************************************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
#include <w2c/config.h>
-#ifdef __cplusplus
-}
-#endif
#include <unicode/platform.h> // We need this first
#include <unicode/ubidi.h>
@@ -49,6 +43,8 @@ extern "C" {
#include <hb-icu.h>
#include <hb-ot.h>
+#include "XeTeX_web.h"
+
#include "XeTeXLayoutInterface.h"
#include "XeTeXFontInst.h"
#ifdef XETEX_MAC