diff options
| author | DJ Delorie <dj@redhat.com> | 2005-07-12 14:34:51 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2005-07-12 14:34:51 +0400 |
| commit | 9fa04b085a98f9c1578c23b0124e169af8e9530e (patch) | |
| tree | 53f0dc381b679583c99b6e7c4193aa94ef4439dd /include | |
| parent | 2c193664e375e09b56001836b8cd0d2c72ba9c2c (diff) | |
merge from gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/xregex2.h | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index d55775046..063e082cb 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2005-07-12 Ben Elliston <bje@au.ibm.com> + + * xregex2.h (regexec): Qualify this prototype with __extension__ + when compiling with GNU C. + 2005-07-07 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * dis-asm.h (fprintf_ftype): Add format attribute. diff --git a/include/xregex2.h b/include/xregex2.h index 358f31e43..d3d0da14a 100644 --- a/include/xregex2.h +++ b/include/xregex2.h @@ -1,6 +1,9 @@ /* Definitions for data structures and routines for the regular expression library, version 0.12. - Copyright (C) 1985,1989-1993,1995-1998, 2000 Free Software Foundation, Inc. + + Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 1996, 1997, + 1998, 2000, 2005 Free Software Foundation, Inc. + This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. @@ -533,6 +536,9 @@ extern int regcomp (regex_t *__restrict __preg, const char *__restrict __pattern, int __cflags); +#if (__GNUC__) +__extension__ +#endif extern int regexec (const regex_t *__restrict __preg, const char *__restrict __string, size_t __nmatch, regmatch_t __pmatch[__restrict_arr], |