about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2016-01-13 13:31:34 -0800
committerH.J. Lu <hjl.tools@gmail.com>2016-01-15 08:43:07 -0800
commitff10fdd4ef0df890c7fc55d2b3ee485adf3424fa (patch)
tree5a3cfbe64b9f93b7390dd306c44f01bb2ba39c28
parent82a543ffd097f4f5e60e898086f0bda2a647e37f (diff)
downloadglibc-ff10fdd4ef0df890c7fc55d2b3ee485adf3424fa.tar.gz
glibc-ff10fdd4ef0df890c7fc55d2b3ee485adf3424fa.tar.xz
glibc-ff10fdd4ef0df890c7fc55d2b3ee485adf3424fa.zip
Include <bits/stdio.h> when building glibc
-rw-r--r--libio/bits/stdio.h5
-rw-r--r--libio/stdio.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/libio/bits/stdio.h b/libio/bits/stdio.h
index df57e7c69b..0c60296566 100644
--- a/libio/bits/stdio.h
+++ b/libio/bits/stdio.h
@@ -27,7 +27,7 @@
 #endif
 
 
-#ifdef __USE_EXTERN_INLINES
+#if defined __USE_EXTERN_INLINES || defined _LIBC
 /* For -D_FORTIFY_SOURCE{,=2} bits/stdio2.h will define a different
    inline.  */
 # if !(__USE_FORTIFY_LEVEL > 0 && defined __fortify_function)
@@ -138,7 +138,8 @@ __NTH (ferror_unlocked (FILE *__stream))
 #endif /* Use extern inlines.  */
 
 
-#if defined __USE_MISC && defined __GNUC__ && defined __OPTIMIZE__ \
+#if defined __USE_MISC && defined __GNUC__ \
+    && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \
     && !defined __cplusplus
 /* Perform some simple optimizations.  */
 # define fread_unlocked(ptr, size, n, stream) \
diff --git a/libio/stdio.h b/libio/stdio.h
index d8d7fa0611..44738a49d6 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -929,7 +929,7 @@ extern void funlockfile (FILE *__stream) __THROW;
 
 /* If we are compiling with optimizing read this file.  It contains
    several optimizing inline functions and macros.  */
-#ifdef __USE_EXTERN_INLINES
+#if defined __USE_EXTERN_INLINES || defined _LIBC
 # include <bits/stdio.h>
 #endif
 #if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function