diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-03-17 11:00:59 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-03-17 11:00:59 +0000 |
commit | 87f94469e917f9fa8e90af35d880daeb7f38ec01 (patch) | |
tree | 608c6b5e41776ac9e1169ae5ef90d7408819a2d8 /Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp | |
parent | f305bb496368b3e6c556c84f85d76e22014640c3 (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/XeTeXOTMath.cpp')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp b/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp index f66a23c6fe6..551101e4878 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp +++ b/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp @@ -2,7 +2,7 @@ Part of the XeTeX typesetting system Copyright (c) 1994-2008 by SIL International Copyright (c) 2009 by Jonathan Kew - Copyright (c) 2012 by Khaled Hosny + Copyright (c) 2012-2014 by Khaled Hosny SIL Author(s): Jonathan Kew @@ -31,31 +31,17 @@ 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 <assert.h> #include "XeTeXOTMath.h" -#include "XeTeX_ext.h" +#include "XeTeX_web.h" #include "XeTeXLayoutInterface.h" #include "XeTeXFontInst.h" #include "XeTeXswap.h" -typedef void* voidptr; - -extern "C" { - extern voidptr* fontlayoutengine; - extern integer* fontarea; - extern integer* fontsize; -} - static int32_t getCoverage(const Coverage* coverage, GlyphID g) { if (SWAP(coverage->format) == 1) { |