diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bits/sigset.h | 8 | ||||
| -rw-r--r-- | sysdeps/generic/glob.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/sigset.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/sysv4/bits/sigset.h | 8 | ||||
| -rw-r--r-- | sysdeps/wordsize-32/inttypes.h | 4 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/inttypes.h | 4 |
6 files changed, 19 insertions, 12 deletions
diff --git a/sysdeps/generic/bits/sigset.h b/sysdeps/generic/bits/sigset.h index c442d53643..a57458dd28 100644 --- a/sysdeps/generic/bits/sigset.h +++ b/sysdeps/generic/bits/sigset.h @@ -38,7 +38,7 @@ typedef unsigned long int __sigset_t; #define _SIGSET_H_fns 1 #ifndef _EXTERN_INLINE -#define _EXTERN_INLINE extern __inline +# define _EXTERN_INLINE extern __inline #endif /* Return a mask that includes SIG only. The cast to `sigset_t' avoids @@ -63,7 +63,8 @@ extern int __sigismember (__const __sigset_t *, int); extern int __sigaddset (__sigset_t *, int); extern int __sigdelset (__sigset_t *, int); -#define __SIGSETFN(NAME, BODY, CONST) \ +#ifdef __USE_EXTERN_INLINES +# define __SIGSETFN(NAME, BODY, CONST) \ _EXTERN_INLINE int \ NAME (CONST __sigset_t *__set, int __sig) \ { \ @@ -75,7 +76,8 @@ __SIGSETFN (__sigismember, (*__set & __mask) ? 1 : 0, __const) __SIGSETFN (__sigaddset, ((*__set |= __mask), 0), ) __SIGSETFN (__sigdelset, ((*__set &= ~__mask), 0), ) -#undef __SIGSETFN +# undef __SIGSETFN +#endif #endif /* ! _SIGSET_H_fns. */ diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c index 591bd56f7e..509fc1b972 100644 --- a/sysdeps/generic/glob.c +++ b/sysdeps/generic/glob.c @@ -253,6 +253,7 @@ extern char *alloca (); # define readdir(str) __readdir (str) # define getpwnam_r(name, bufp, buf, len, res) \ __getpwnam_r (name, bufp, buf, len, res) +# define __stat(fname, buf) __xstat (_STAT_VER, fname, buf) #endif #if !(defined STDC_HEADERS || defined __GNU_LIBRARY__) diff --git a/sysdeps/unix/sysv/linux/bits/sigset.h b/sysdeps/unix/sysv/linux/bits/sigset.h index 14f30cbfd8..66a9c51c54 100644 --- a/sysdeps/unix/sysv/linux/bits/sigset.h +++ b/sysdeps/unix/sysv/linux/bits/sigset.h @@ -104,7 +104,8 @@ extern int __sigismember (__const __sigset_t *, int); extern int __sigaddset (__sigset_t *, int); extern int __sigdelset (__sigset_t *, int); -# define __SIGSETFN(NAME, BODY, CONST) \ +# ifdef __USE_EXTERN_INLINES +# define __SIGSETFN(NAME, BODY, CONST) \ _EXTERN_INLINE int \ NAME (CONST __sigset_t *__set, int __sig) \ { \ @@ -117,7 +118,8 @@ __SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, __const) __SIGSETFN (__sigaddset, ((__set->__val[__word] |= __mask), 0), ) __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), ) -#undef __SIGSETFN +# undef __SIGSETFN +# endif #endif /* ! _SIGSET_H_fns. */ diff --git a/sysdeps/unix/sysv/sysv4/bits/sigset.h b/sysdeps/unix/sysv/sysv4/bits/sigset.h index 1461c93b3d..c5d596dad8 100644 --- a/sysdeps/unix/sysv/sysv4/bits/sigset.h +++ b/sysdeps/unix/sysv/sysv4/bits/sigset.h @@ -48,9 +48,10 @@ typedef struct #define __SSELT(s) ((s) / __NSSBITS) #define __SSMASK(s) (1 << ((s) % __NSSBITS)) -#ifndef _EXTERN_INLINE -#define _EXTERN_INLINE extern __inline -#endif +#ifdef __USE_EXTERN_INLINES +# ifndef _EXTERN_INLINE +# define _EXTERN_INLINE extern __inline +# endif _EXTERN_INLINE int __sigemptyset (__sigset_t *__set) @@ -92,5 +93,6 @@ __sigismember (__const __sigset_t *__set, int __sig) return 1; return 0; } +#endif /* use extern inlines. */ #endif /* ! _SIGSET_H_fns */ diff --git a/sysdeps/wordsize-32/inttypes.h b/sysdeps/wordsize-32/inttypes.h index 188f4def4a..79d3eed31c 100644 --- a/sysdeps/wordsize-32/inttypes.h +++ b/sysdeps/wordsize-32/inttypes.h @@ -204,7 +204,7 @@ extern intmax_t wcstoimax __P ((__const wchar_t * __restrict __nptr, extern uintmax_t wcstoumax __P ((__const wchar_t * __restrict __nptr, wchar_t ** __restrict __endptr, int __base)); -#if defined __GNUC__ && __GNUC__ >= 2 && defined __OPTIMIZE__ +#ifdef __USE_EXTERN_INLINES /* Like `strtol' but convert to `intmax_t'. */ # ifndef __strtoll_internal_defined @@ -267,7 +267,7 @@ wcstoumax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr, { return __wcstoull_internal (nptr, endptr, base, 0); } -#endif /* GCC and Optimization. */ +#endif /* Use extern inlines. */ __END_DECLS diff --git a/sysdeps/wordsize-64/inttypes.h b/sysdeps/wordsize-64/inttypes.h index 5e497dbfae..c76d2c887d 100644 --- a/sysdeps/wordsize-64/inttypes.h +++ b/sysdeps/wordsize-64/inttypes.h @@ -210,7 +210,7 @@ extern intmax_t wcstoimax __P ((__const wchar_t * __restrict __nptr, extern uintmax_t wcstoumax __P ((__const wchar_t * __restrict __nptr, wchar_t ** __restrict __endptr, int __base)); -#if defined __GNUC__ && __GNUC__ >= 2 && defined __OPTIMIZE__ +#ifdef __USE_EXTERN_INLINES /* Like `strtol' but convert to `intmax_t'. */ # ifndef __strtol_internal_defined @@ -269,7 +269,7 @@ wcstoumax (__const wchar_t *__restrict nptr, wchar_t **__restrict endptr, { return __wcstoul_internal (nptr, endptr, base, 0); } -#endif /* GCC and Optimization. */ +#endif /* Use extern inlines. */ __END_DECLS |