From 613698c025d047e99d9666c37da2f49b97a8c803 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Tue, 6 Feb 2007 01:25:59 +0000 Subject: [PATCH] check in required changes for base/sys/sysmacros.h From-SVN: r121636 --- fixincludes/fixincl.x | 4 ++-- fixincludes/inclhack.def | 1 + fixincludes/tests/base/sys/sysmacros.h | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index ffb4c979dd7..a9e27d8990b 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 Monday February 5, 2007 at 05:33:02 PM CET + * It has been AutoGen-ed Monday February 5, 2007 at 05:19:14 PM PST * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Feb 5 17:33:02 CET 2007 +/* DO NOT SVN-MERGE THIS FILE, EITHER Mon Feb 5 17:19:14 PST 2007 * * You must regenerate it. Use the ./genfixes script. * diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index e47d7bdcd15..e2ac55c2aa4 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -1375,6 +1375,7 @@ fix = { test_text = <<-EOT __extension__ extern __inline unsigned int __extension__ __extern_inline unsigned int + extern __inline unsigned int EOT; }; diff --git a/fixincludes/tests/base/sys/sysmacros.h b/fixincludes/tests/base/sys/sysmacros.h index 40c44f6183e..34d0ed51a3d 100644 --- a/fixincludes/tests/base/sys/sysmacros.h +++ b/fixincludes/tests/base/sys/sysmacros.h @@ -11,9 +11,14 @@ #if defined( GLIBC_C99_INLINE_4_CHECK ) __extension__ -#if __STDC_VERSION__ < 19901L +#if __STDC_VERSION__ < 199901L extern #endif __inline unsigned int __extension__ __extern_inline unsigned int + +#if __STDC_VERSION__ < 199901L +extern +#endif +__inline unsigned int #endif /* GLIBC_C99_INLINE_4_CHECK */