aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2001-11-16 22:31:03 +0000
committerDJ Delorie <dj@redhat.com>2001-11-16 22:31:03 +0000
commit941d74a0b03b83c2da785c59ef04004eb3ff1ff2 (patch)
tree554524672a504b1cfba4925d94dc7da8e35d6fb7
parent20a940cc8c7878821b93e69069918b327047a34e (diff)
downloadgdb-941d74a0b03b83c2da785c59ef04004eb3ff1ff2.zip
gdb-941d74a0b03b83c2da785c59ef04004eb3ff1ff2.tar.gz
gdb-941d74a0b03b83c2da785c59ef04004eb3ff1ff2.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/regex.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 933cc38..7fdce6a 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 5ead8b6..a64cd56 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