diff options
| author | hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-02-04 15:31:25 +0000 |
|---|---|---|
| committer | hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-02-04 15:31:25 +0000 |
| commit | 661832db7086a227979240980f1cdc10376c0dd4 (patch) | |
| tree | 2f2ed548082372a8ae8ce3b6f30e7708cf25db23 /fixincludes/tests | |
| parent | 5bad702ffba44112598b9583b48782c7c6fedba7 (diff) | |
| download | gcc-661832db7086a227979240980f1cdc10376c0dd4.tar.gz | |
* inclhack.def: (glibc_c99_inline_1a): Re-add last change.
(glibc_c99_inline_3) <bypass>: Change from __STDC_VERSION__ to
__extern_inline|__GNU_STDC_INLINE__.
(glibc_c99_inline_4) <files>: Add wchar.h and */wchar.h.
<bypass>: Change from __STDC_VERSION__ to
__extern_inline|__GNU_STDC_INLINE__.
<first c_fix_arg>: Change from #ifdef-wrapping the extern part to
appending attribute-gnu_inline.
<second c_fix_arg>: Remove.
<test_text>: Remove __extern_inline line.
* tests/base/features.h: Re-add.
* tests/base/sys/sysmacros.h: Adjust.
* fixincl.x: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132092 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes/tests')
| -rw-r--r-- | fixincludes/tests/base/features.h | 23 | ||||
| -rw-r--r-- | fixincludes/tests/base/sys/sysmacros.h | 13 |
2 files changed, 25 insertions, 11 deletions
diff --git a/fixincludes/tests/base/features.h b/fixincludes/tests/base/features.h new file mode 100644 index 00000000000..93838c71253 --- /dev/null +++ b/fixincludes/tests/base/features.h @@ -0,0 +1,23 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/features.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( GLIBC_C99_INLINE_1_CHECK ) +#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ +# define __USE_EXTERN_INLINES 1 +#endif +#endif /* GLIBC_C99_INLINE_1_CHECK */ + + +#if defined( GLIBC_C99_INLINE_1A_CHECK ) +#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && (defined __extern_inline || defined __GNUC_GNU_INLINE__) +# define __USE_EXTERN_INLINES 1 +#endif +#endif /* GLIBC_C99_INLINE_1A_CHECK */ diff --git a/fixincludes/tests/base/sys/sysmacros.h b/fixincludes/tests/base/sys/sysmacros.h index 6fc19425e84..2fc3398f468 100644 --- a/fixincludes/tests/base/sys/sysmacros.h +++ b/fixincludes/tests/base/sys/sysmacros.h @@ -10,15 +10,6 @@ #if defined( GLIBC_C99_INLINE_4_CHECK ) -__extension__ -#ifdef __GNUC_GNU_INLINE__ -extern -#endif -__inline unsigned int -__extension__ __extern_inline unsigned int - -#ifdef __GNUC_GNU_INLINE__ -extern -#endif -__inline unsigned int +__extension__ extern __inline __attribute__ ((__gnu_inline__)) unsigned int +extern __inline __attribute__ ((__gnu_inline__)) unsigned int #endif /* GLIBC_C99_INLINE_4_CHECK */ |