merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 933cc38..7fdce6a 100644 (file)
--- 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 (file)
--- 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