diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ctype/ctype.h | 5 | ||||
| -rw-r--r-- | include/features.h | 5 | ||||
| -rw-r--r-- | stdlib/stdlib.h | 3 | ||||
| -rw-r--r-- | string/string.h | 3 | ||||
| -rw-r--r-- | wcsmbs/wchar.h | 3 |
6 files changed, 20 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 4d88687c25..253f070500 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-05-05 Jakub Jelinek <jakub@redhat.com> + + * include/features.h (__USE_EXTERN_INLINES): Don't define if + __NO_INLINE__ is defined. + * ctype/ctype.h (tolower, toupper): Change the guard condition to + __USE_EXTERN_INLINES check only. + * stdlib/stdlib.h (strtod, ...): Likewise. + * wcsmbs/wchar.h (mbrlen): Likewise. + * string/string.h: Only include bits/string.h and bits/string2.h + if __NO_INLINE__ is not defined. + 2001-05-07 Andreas Jaeger <aj@suse.de> * debug/Makefile ($(objpfx)xtrace): Substitute @SLIBDIR@ instead diff --git a/ctype/ctype.h b/ctype/ctype.h index 6ae8f75681..f46dd86bc6 100644 --- a/ctype/ctype.h +++ b/ctype/ctype.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,93,95,96,97,98,99 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,95,96,97,98,99,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -163,8 +163,7 @@ __exctype (_tolower); # define isblank(c) __isctype((c), _ISblank) # endif -# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \ - && defined __USE_EXTERN_INLINES +# ifdef __USE_EXTERN_INLINES extern __inline int tolower (int __c) __THROW { diff --git a/include/features.h b/include/features.h index b24528e596..0d9c9bdab9 100644 --- a/include/features.h +++ b/include/features.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,93,95,96,97,98,99, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -293,7 +293,8 @@ #endif /* !ASSEMBLER */ /* Decide whether we can define 'extern inline' functions in headers. */ -#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ +#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \ + && !defined __OPTIMIZE_SIZE__ && !defined __NO_INLINE__ # define __USE_EXTERN_INLINES 1 #endif diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 5d410af712..5283440e4f 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -287,8 +287,7 @@ extern unsigned long long int __strtoull_internal (__const char * # endif #endif /* GCC */ -#if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \ - && defined __USE_EXTERN_INLINES +#ifdef __USE_EXTERN_INLINES /* Define inline functions which call the internal entry points. */ extern __inline double diff --git a/string/string.h b/string/string.h index 08ebdfc681..386ed7648c 100644 --- a/string/string.h +++ b/string/string.h @@ -333,7 +333,8 @@ extern char *basename (__const char *__filename) __THROW; #if defined __GNUC__ && __GNUC__ >= 2 -# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined __cplusplus +# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \ + && !defined __NO_INLINE__ && !defined __cplusplus /* When using GNU CC we provide some optimized versions of selected functions from this header. There are two kinds of optimizations: diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 2130c12d4b..4206c796f7 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -284,8 +284,7 @@ extern size_t __mbrlen (__const char *__restrict __s, size_t __n, extern size_t mbrlen (__const char *__restrict __s, size_t __n, mbstate_t *__restrict __ps) __THROW; -#if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \ - && defined __USE_EXTERN_INLINES +#ifdef __USE_EXTERN_INLINES /* Define inline function as optimization. */ extern __inline size_t mbrlen (__const char *__restrict __s, size_t __n, mbstate_t *__restrict __ps) __THROW |