diff options
| author | DJ Delorie <dj@delorie.com> | 2001-11-16 22:31:03 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2001-11-16 22:31:03 +0000 |
| commit | ac5558e1046a0d96ba79328359668c9088724a43 (patch) | |
| tree | 7947f425fd7161c1e7eee297d27ca8b4137b8449 | |
| parent | b840deb89cb15d10167f63a505520d29b8519268 (diff) | |
| download | gdb-ac5558e1046a0d96ba79328359668c9088724a43.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/regex.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 933cc38c646..7fdce6ab1b5 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2001-11-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * regex.c: Check defined(__STDC__) || defined(ALMOST_STDC) || + defined(HAVE_STRINGIZE) to determine whether ISO CPP token pasting + is available. + Thu Nov 15 11:06:25 2001 Jeffrey A Law (law@cygnus.com) * config.in (HAVE_UINTPTR_T): Provide autoconf stub. diff --git a/libiberty/regex.c b/libiberty/regex.c index 5ead8b642d6..a64cd562736 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -612,7 +612,7 @@ typedef enum # define UCHAR_T unsigned char # define COMPILED_BUFFER_VAR bufp->buffer # define OFFSET_ADDRESS_SIZE 2 -# if defined __STDC__ && __STDC__ +# if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) # define PREFIX(name) byte_##name # else # define PREFIX(name) byte_/**/name @@ -626,7 +626,7 @@ typedef enum # define COMPILED_BUFFER_VAR wc_buffer # define OFFSET_ADDRESS_SIZE 1 /* the size which STORE_NUMBER macro use */ # define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CHAR_T)+1) -# if defined __STDC__ && __STDC__ +# if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) # define PREFIX(name) wcs_##name # define ARG_PREFIX(name) c##name # else |