summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorbje <bje@138bc75d-0d04-0410-961f-82ee72b054a4>2005-07-12 04:39:07 +0000
committerbje <bje@138bc75d-0d04-0410-961f-82ee72b054a4>2005-07-12 04:39:07 +0000
commit317d4fdaf2eef47b9aaffa40663bff4bca22ad6c (patch)
treea94e497fb0d00a163c709c87ef27f748f4fcf1ab /include
parent063f5fdd40486f181a876af5abec3f95a3ccd326 (diff)
downloadgcc-317d4fdaf2eef47b9aaffa40663bff4bca22ad6c.tar.gz
* xregex2.h (regexec): Qualify this prototype with __extension__
when compiling with GNU C. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101910 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/xregex2.h8
2 files changed, 12 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 8799b295896..c60ddc25f28 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-03 Steve Ellcey <sje@cup.hp.com>
PR other/13906
diff --git a/include/xregex2.h b/include/xregex2.h
index 358f31e4378..d3d0da14a98 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],