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/hz.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/hz.cpp')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/hz.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/xetexdir/hz.cpp b/Build/source/texk/web2c/xetexdir/hz.cpp index 927bb3cdf10..113a03f7a28 100644 --- a/Build/source/texk/web2c/xetexdir/hz.cpp +++ b/Build/source/texk/web2c/xetexdir/hz.cpp @@ -1,6 +1,6 @@ /****************************************************************************\ Part of the XeTeX typesetting system - Copyright (c) 2010-2012 by Han The Thanh + Copyright (c) 2010-2014 by Han The Thanh Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -27,15 +27,9 @@ 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 "XeTeX_ext.h" +#include "XeTeX_web.h" #include <map> #include <iostream> @@ -46,8 +40,6 @@ typedef pair<int, unsigned int> GlyphId; typedef map<GlyphId, int> ProtrusionFactor; ProtrusionFactor leftProt, rightProt; -extern "C" { - void set_cp_code(int fontNum, unsigned int code, int side, int value) { GlyphId id(fontNum, code); @@ -83,6 +75,3 @@ int get_cp_code(int fontNum, unsigned int code, int side) return it->second; } -} - - |