diff options
author | Daniel Berlin <dberlin@dbrelin.org> | 2007-04-08 00:16:51 +0000 |
---|---|---|
committer | Daniel Berlin <dberlin@dbrelin.org> | 2007-04-08 00:16:51 +0000 |
commit | 903a1b3d358eb02f6809e9a03ed960c86e11902e (patch) | |
tree | 4826c1efa665f8b6a73623250a447ba303d2e7a6 /fixincludes/tests/base | |
parent | eebfa77c775f8badb6755d20a678c83cb3cde80f (diff) |
Merge from mainline
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/dataflow-branch@123656 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes/tests/base')
-rw-r--r-- | fixincludes/tests/base/bits/string2.h | 2 | ||||
-rw-r--r-- | fixincludes/tests/base/signal.h | 20 | ||||
-rw-r--r-- | fixincludes/tests/base/sys/stat.h | 4 | ||||
-rw-r--r-- | fixincludes/tests/base/sys/sysmacros.h | 4 |
4 files changed, 25 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/signal.h b/fixincludes/tests/base/signal.h new file mode 100644 index 00000000000..91afbedb01c --- /dev/null +++ b/fixincludes/tests/base/signal.h @@ -0,0 +1,20 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/signal.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( NETBSD_C99_INLINE_1_CHECK ) +extern +#ifdef __GNUC_STDC_INLINE__ +__attribute__((__gnu_inline__)) +#endif +__inline int +sigaddset(sigset_t *set, int signo) +{} +#endif /* NETBSD_C99_INLINE_1_CHECK */ 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 |