diff options
| author | DJ Delorie <dj@redhat.com> | 2001-11-15 19:06:06 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2001-11-15 19:06:06 +0000 |
| commit | dc5790516edcfb5c1a1e92208c59d637391601ef (patch) | |
| tree | 959c0279842c90ca7effa6c9080be5defb2e047b /libiberty/regex.c | |
| parent | 45a1e866786da584cd7ca1752d1513ce8dbb85fc (diff) | |
| download | gdb-dc5790516edcfb5c1a1e92208c59d637391601ef.zip gdb-dc5790516edcfb5c1a1e92208c59d637391601ef.tar.gz gdb-dc5790516edcfb5c1a1e92208c59d637391601ef.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty/regex.c')
| -rw-r--r-- | libiberty/regex.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libiberty/regex.c b/libiberty/regex.c index 2852e84..5ead8b6 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -301,7 +301,7 @@ init_syntax_once () # endif /* emacs */ /* Integer type for pointers. */ -# if !defined _LIBC +# if !defined _LIBC && !defined HAVE_UINTPTR_T typedef unsigned long int uintptr_t; # endif @@ -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 |