diff options
| author | Karl Berry <karl@freefriends.org> | 2006-12-31 23:19:46 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2006-12-31 23:19:46 +0000 |
| commit | 526d6214fc0f988fa9ea0ddc34658993fdbdf9f2 (patch) | |
| tree | ee188d9a0edf131cfd7138d291f391146234d40b /Build | |
| parent | f9f0a3f94098db14e4130a6f2cd7c4bb837be140 (diff) | |
do not let "inline" be #define-d under C++
git-svn-id: svn://tug.org/texlive/trunk@3069 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/web2c/config.h | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 6ae831ca26b..5a075006689 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2007-01-01 Karl Berry <karl@tug.org> + + * config.h (inline) [__cplusplus]: #undef inline under C++, since + inline is a keyword. It should never be #define'd, but + c-auto.in->h can do so. Found by vvv on AIX. + 2006-12-30 Karl Berry <karl@tug.org> * configure.in: bump version to 7.5.6. diff --git a/Build/source/texk/web2c/config.h b/Build/source/texk/web2c/config.h index 2c5933fea90..cb68a6a9c1e 100644 --- a/Build/source/texk/web2c/config.h +++ b/Build/source/texk/web2c/config.h @@ -1,6 +1,6 @@ /* config.h: All .c files include this first. -Copyright (C) 1995, 96 Karl Berry. +Copyright (C) 1995, 1996, 2006 Karl Berry. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,6 +33,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <kpathsea/config.h> #include <web2c/c-auto.h> +/* However, inline is a keyword in C++, and should never be #define'd. + Apparently Autoconf does not know this, at least the ancient version + we are stuck with. (Even though the Autoconf *test* is #ifdef'd.) */ +#ifdef __cplusplus +#undef inline +#endif + #include <kpathsea/c-vararg.h> /* How to open a binary file. */ |