diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/include/itable.h | 8 | ||||
| -rw-r--r-- | src/include/ptable.h | 8 |
4 files changed, 15 insertions, 14 deletions
@@ -1,3 +1,14 @@ +2021-08-28 G. Branden Robinson <g.branden.robinson@gmail.com> + + [libgroff]: Drop support for `TRADITIONAL_CPP`. This means a C + preprocessor that does not support the ANSI C89/ISO C90 + token concatenation operator "##". + + * src/include/itable.h: + * src/include/ptable.h: Do it. + + * Makefile.am: Undocument preprocessor symbol. + 2021-08-27 G. Branden Robinson <g.branden.robinson@gmail.com> [libgroff]: Drop `a_delete` preprocessor wrapper for the diff --git a/Makefile.am b/Makefile.am index e2ef2eb96..9aea88945 100644 --- a/Makefile.am +++ b/Makefile.am @@ -441,8 +441,6 @@ man7dir=$(manroot)/man$(man7ext) # uintmax_t=<value> define to `unsigned long' or `unsigned long # long' if <inttypes.h> does not exist # -# TRADITIONAL_CPP if your C++ compiler uses a traditional -# (Reiser) preprocessor # PAGE=A4 if the printer's page size is A4 # GHOSTSCRIPT=gs the name (and directory if required) of the # ghostscript program diff --git a/src/include/itable.h b/src/include/itable.h index 3ea99f7e1..29745b964 100644 --- a/src/include/itable.h +++ b/src/include/itable.h @@ -20,12 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <assert.h> // name2(a,b) concatenates two C identifiers. -#ifdef TRADITIONAL_CPP -# define name2(a,b) a/**/b -#else /* not TRADITIONAL_CPP */ -# define name2(a,b) name2x(a,b) -# define name2x(a,b) a ## b -#endif /* not TRADITIONAL_CPP */ +#define name2(a,b) name2x(a,b) +#define name2x(a,b) a ## b // 'class ITABLE(T)' is the type of a hash table mapping an integer (int >= 0) // to an object of type T. diff --git a/src/include/ptable.h b/src/include/ptable.h index 8ac7bda2c..4bcbefbb5 100644 --- a/src/include/ptable.h +++ b/src/include/ptable.h @@ -21,12 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <string.h> // name2(a,b) concatenates two C identifiers. -#ifdef TRADITIONAL_CPP -# define name2(a,b) a/**/b -#else /* not TRADITIONAL_CPP */ -# define name2(a,b) name2x(a,b) -# define name2x(a,b) a ## b -#endif /* not TRADITIONAL_CPP */ +#define name2(a,b) name2x(a,b) +#define name2x(a,b) a ## b // 'class PTABLE(T)' is the type of a hash table mapping a string // (const char *) to an object of type T. |