diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-03-26 13:25:26 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-03-26 13:25:26 +0000 |
| commit | 7e4d47f0f9c19a5d495592749610a399f42834c4 (patch) | |
| tree | 3feb17c59e9b13054c14d08bc1654ae951120a7d /fixincludes/tests | |
| parent | 211d5b9a30550be7905229da85e7bbbf20801e12 (diff) | |
| download | gcc-7e4d47f0f9c19a5d495592749610a399f42834c4.tar.gz | |
* inclhack.def (glibc_c99_inline_1): Define __USE_EXTERN_INLINES
if __extern_inline or __GNUC_GNU_INLINE__ is defined rather than
__STDC_VERSION__ < 199901L.
(glibc_c99_inline_2): Replace #if __STDC_VERSION__ < 199901L
with #ifdef __GNUC_GNU_INLINE__.
(glibc_c99_inline_3): Add select. Replace __STDC_VERSION__ >= 199901L
with defined(__GNUC_STDC_INLINE__).
(glibc_c99_inline_4): Change select, add second c_fix_arg.
Replace #if __STDC_VERSION__ < 199901L with
#ifdef __GNUC_GNU_INLINE__.
* fixincl.x: Regenerated.
* tests/base/bits/string2.h: Update.
* tests/base/sys/sysmacros.h: Update.
* tests/base/sys/stat.h: Update.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123216 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes/tests')
| -rw-r--r-- | fixincludes/tests/base/bits/string2.h | 2 | ||||
| -rw-r--r-- | fixincludes/tests/base/sys/stat.h | 4 | ||||
| -rw-r--r-- | fixincludes/tests/base/sys/sysmacros.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fixincludes/tests/base/bits/string2.h b/fixincludes/tests/base/bits/string2.h index 0d37faaad69..1da54fdec70 100644 --- a/fixincludes/tests/base/bits/string2.h +++ b/fixincludes/tests/base/bits/string2.h @@ -10,7 +10,7 @@ #if defined( GLIBC_C99_INLINE_3_CHECK ) -# if defined(__cplusplus) || __STDC_VERSION__ >= 19901L +# if defined(__cplusplus) || defined(__GNUC_STDC_INLINE__) # define __STRING_INLINE inline # else # define __STRING_INLINE extern __inline diff --git a/fixincludes/tests/base/sys/stat.h b/fixincludes/tests/base/sys/stat.h index 51fe835d3a6..d677a13292f 100644 --- a/fixincludes/tests/base/sys/stat.h +++ b/fixincludes/tests/base/sys/stat.h @@ -15,11 +15,11 @@ #if defined( GLIBC_C99_INLINE_2_CHECK ) -#if __STDC_VERSION__ < 199901L +#ifdef __GNUC_GNU_INLINE__ extern #endif __inline__ int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2)); -#if __STDC_VERSION__ < 199901L +#ifdef __GNUC_GNU_INLINE__ extern #endif __inline__ int diff --git a/fixincludes/tests/base/sys/sysmacros.h b/fixincludes/tests/base/sys/sysmacros.h index 34d0ed51a3d..6fc19425e84 100644 --- a/fixincludes/tests/base/sys/sysmacros.h +++ b/fixincludes/tests/base/sys/sysmacros.h @@ -11,13 +11,13 @@ #if defined( GLIBC_C99_INLINE_4_CHECK ) __extension__ -#if __STDC_VERSION__ < 199901L +#ifdef __GNUC_GNU_INLINE__ extern #endif __inline unsigned int __extension__ __extern_inline unsigned int -#if __STDC_VERSION__ < 199901L +#ifdef __GNUC_GNU_INLINE__ extern #endif __inline unsigned int |