aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorJeffrey A Law <law@cygnus.com>2001-11-15 18:04:08 +0000
committerJeff Law <law@gcc.gnu.org>2001-11-15 11:04:08 -0700
commit7ddfb6510be7c234613740311fa1d2b5974d02dc (patch)
tree17e9a6b02ba2661b9613deb1d8389c125400630c /libiberty
parent18b5b8d64ccdb9c9bc94f352a03f524467e8ad26 (diff)
downloadgcc-7ddfb6510be7c234613740311fa1d2b5974d02dc.zip
gcc-7ddfb6510be7c234613740311fa1d2b5974d02dc.tar.gz
gcc-7ddfb6510be7c234613740311fa1d2b5974d02dc.tar.bz2
regex.c (PREFIX): Provide an alternate definition for non-ANSI/ISO compilers.
* regex.c (PREFIX): Provide an alternate definition for non-ANSI/ISO compilers. (ARG_PREFIX): Likewise. From-SVN: r47067
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/regex.c15
2 files changed, 18 insertions, 3 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3b72a0c..4851fbf 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 15 11:06:25 2001 Jeffrey A Law (law@cygnus.com)
+
+ * regex.c (PREFIX): Provide an alternate definition for
+ non-ANSI/ISO compilers.
+ (ARG_PREFIX): Likewise.
+
2001-11-12 Jim Meyering <meyering@lucent.com>
* obstack.c (_): Honor the setting of ENABLE_NLS. Otherwise,
diff --git a/libiberty/regex.c b/libiberty/regex.c
index 2852e84..48429d4 100644
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -612,7 +612,11 @@ typedef enum
# define UCHAR_T unsigned char
# define COMPILED_BUFFER_VAR bufp->buffer
# define OFFSET_ADDRESS_SIZE 2
-# define PREFIX(name) byte_##name
+# if defined __STDC__ && __STDC__
+# define PREFIX(name) byte_##name
+# else
+# define PREFIX(name) byte_/**/name
+# endif
# define ARG_PREFIX(name) name
# define PUT_CHAR(c) putchar (c)
#else
@@ -622,8 +626,13 @@ 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)
-# define PREFIX(name) wcs_##name
-# define ARG_PREFIX(name) c##name
+# if defined __STDC__ && __STDC__
+# define PREFIX(name) wcs_##name
+# define ARG_PREFIX(name) c##name
+# else
+# define PREFIX(name) wcs_/**/name
+# define ARG_PREFIX(name) c/**/name
+# endif
/* Should we use wide stream?? */
# define PUT_CHAR(c) printf ("%C", c);
# define TRUE 1