merge from gcc

This commit is contained in:
DJ Delorie 2001-11-16 22:31:03 +00:00
parent 20a940cc8c
commit 941d74a0b0
2 changed files with 8 additions and 2 deletions

View File

@ -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.

View File

@ -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