From 96ae0001f5d6f104b82e03e15aac1c6964407fb5 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 13 May 2002 20:45:23 +0000 Subject: 2002-05-13 Marcus Brinkmann * version.h.in (STANDARD_HURD_VERSION): Remove EXTRA argument, because cpp 3.0 is not removing any token before ##args that is not a single comma, in order to be more C99 compliant. (_SHV_SEP): Removed. (STANDARD_HURD_VERSION_EXTRA): New macro that does the job of the old macro with an extra argument. --- ChangeLog | 9 +++++++++ version.h.in | 9 ++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 578c1b3a..88f70881 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-05-13 Marcus Brinkmann + + * version.h.in (STANDARD_HURD_VERSION): Remove EXTRA argument, + because cpp 3.0 is not removing any token before ##args that is + not a single comma, in order to be more C99 compliant. + (_SHV_SEP): Removed. + (STANDARD_HURD_VERSION_EXTRA): New macro that does the job of the + old macro with an extra argument. + 2002-04-27 Roland McGrath * configure.in: Match $host_cpu of powerpc*, not just powerpc. diff --git a/version.h.in b/version.h.in index 1c822701..80e75b52 100644 --- a/version.h.in +++ b/version.h.in @@ -23,8 +23,7 @@ #endif /* The standard way to print versions for --version. */ -#define _SHV_SEP "; " -#define STANDARD_HURD_VERSION(s, extra...) \ - #s " (GNU Hurd" _SHV_SEP ##extra ") " HURD_VERSION - - +#define STANDARD_HURD_VERSION(s) \ + #s " (GNU Hurd) " HURD_VERSION +#define STANDARD_HURD_VERSION_EXTRA(s, extra) \ + #s " (GNU Hurd; " extra ") " HURD_VERSION -- cgit v1.2.3