summary refs log tree commit diff
path: root/string/string.h
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2001-05-07 08:43:11 +0000
committerAndreas Jaeger <aj@suse.de>2001-05-07 08:43:11 +0000
commit07c416ed0979daa54e0b032986aaaf1b892cc690 (patch)
tree8f3459afbbf7281749c11a4e6205f02c51b55b34 /string/string.h
parent3ebab9ee234273cba06a488b5acabc3cb6538d5b (diff)
downloadglibc-07c416ed0979daa54e0b032986aaaf1b892cc690.tar.gz
glibc-07c416ed0979daa54e0b032986aaaf1b892cc690.tar.xz
glibc-07c416ed0979daa54e0b032986aaaf1b892cc690.zip
Update.
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.
Diffstat (limited to 'string/string.h')
-rw-r--r--string/string.h3
1 files changed, 2 insertions, 1 deletions
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: