about summary refs log tree commit diff
path: root/include
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 /include
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 'include')
-rw-r--r--include/features.h5
1 files changed, 3 insertions, 2 deletions
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