diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-01 08:06:59 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-01 08:06:59 +0000 |
commit | b38c5ab240b45ff1b15f9c61306dc7cc65e17d4e (patch) | |
tree | 811c20c743c86a4115775438afa98113d5ec467f /Build/source/texk | |
parent | 481f9296932da0dbc1d6376a56aad177aad1aaaf (diff) |
web2c: Make <w2c/config.h> C++ safe
git-svn-id: svn://tug.org/texlive/trunk@31055 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/w2c/config.h | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 1571ae172f3..67899732d3f 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2013-06-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * w2c/config.h: Adapt to C++, i.e., when compiling C++ surround + all declarations by 'extern "C" {' ... '}'. + 2013-06-27 Peter Breitenlohner <peb@mppmu.mpg.de> * ac/web2c.ac (kpse_tex_progs): Drop explicit XeTeX dependencies diff --git a/Build/source/texk/web2c/w2c/config.h b/Build/source/texk/web2c/w2c/config.h index 0a44572b28d..3888b3f5843 100644 --- a/Build/source/texk/web2c/w2c/config.h +++ b/Build/source/texk/web2c/w2c/config.h @@ -26,6 +26,10 @@ along with this program; if not, see <http://www.gnu.org/licenses/. */ /* How to open a binary file. */ #include <kpathsea/c-fopen.h> +#ifdef __cplusplus +extern "C" { +#endif + /* The smallest signed type: use `signed char' if ANSI C, `short' if char is unsigned, otherwise `char'. */ #ifndef SCHAR_TYPE @@ -126,4 +130,8 @@ extern void uexit (int status); extern void usage (const_string progname); extern void usagehelp (const_string *message, const_string bug_email); +#ifdef __cplusplus +} +#endif + #endif /* not WEB2C_CONFIG_H */ |