diff options
| author | DJ Delorie <dj@delorie.com> | 2001-11-15 19:06:06 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2001-11-15 19:06:06 +0000 |
| commit | a68e9436b883168e502007b4466552a83f300df4 (patch) | |
| tree | 5836bcd30a47d72c425ff0abd6ced14717d839d8 /libiberty/regex.c | |
| parent | bef788f79f92c9c6872fe594476dd569c76d02b4 (diff) | |
| download | gdb-a68e9436b883168e502007b4466552a83f300df4.tar.gz | |
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 2852e849fa8..5ead8b642d6 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 |