diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-05 21:22:48 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-05 21:22:48 +0000 |
| commit | a4cef59cb62962ad633f7df74799290111ce4e32 (patch) | |
| tree | 0895fc74d78a872f2cb6a6ce37a6779de71b4841 /fixincludes | |
| parent | a0faeb5b3e62448dd400d050db8b19b57d0007c6 (diff) | |
| download | gcc-a4cef59cb62962ad633f7df74799290111ce4e32.tar.gz | |
2007-02-05 Richard Guenther <rguenther@suse.de>
* inclhack.def (glibc_c99_inline_4): Adjust selector to cope
with older glibc. Adjust version number for C99.
* fixincl.x: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121614 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 6 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 8 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 1efabd5f403..67bd37766f4 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2007-02-05 Richard Guenther <rguenther@suse.de> + + * inclhack.def (glibc_c99_inline_4): Adjust selector to cope + with older glibc. Adjust version number for C99. + * fixincl.x: Regenerated. + 2007-02-04 Mike Stump <mrs@apple.com> * mkheaders.in: Allow optional isysroot parameter. diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index f97bdb63d85..ffb4c979dd7 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Sunday February 4, 2007 at 07:08:33 AM PST + * It has been AutoGen-ed Monday February 5, 2007 at 05:33:02 PM CET * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Feb 4 07:08:34 PST 2007 +/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Feb 5 17:33:02 CET 2007 * * You must regenerate it. Use the ./genfixes script. * @@ -2320,7 +2320,7 @@ tSCC zGlibc_C99_Inline_4List[] = * content selection pattern - do fix if pattern found */ tSCC zGlibc_C99_Inline_4Select0[] = - " extern "; + "(^| )extern "; /* * content bypass pattern - skip fix if pattern found @@ -2339,7 +2339,7 @@ static tTestDesc aGlibc_C99_Inline_4Tests[] = { static const char* apzGlibc_C99_Inline_4Patch[] = { "format", "\n\ -#if __STDC_VERSION__ < 19901L\n\ +#if __STDC_VERSION__ < 199901L\n\ extern\n\ #endif\n", (char*)NULL }; diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 24dc087f93b..e47d7bdcd15 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -1369,9 +1369,9 @@ fix = { hackname = glibc_c99_inline_4; files = sys/sysmacros.h, '*/sys/sysmacros.h'; bypass = "__STDC_VERSION__"; - select = ' extern '; + select = '(^| )extern '; c_fix = format; - c_fix_arg = "\n#if __STDC_VERSION__ < 19901L\nextern\n#endif\n"; + c_fix_arg = "\n#if __STDC_VERSION__ < 199901L\nextern\n#endif\n"; test_text = <<-EOT __extension__ extern __inline unsigned int __extension__ __extern_inline unsigned int |