about summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/Makefile7
-rw-r--r--stdio-common/vfprintf.c8
2 files changed, 2 insertions, 13 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 4b9ec71338..8c7bae9c45 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -32,11 +32,8 @@ routines	:=							      \
 	perror psignal							      \
 	tmpfile tmpnam tempnam tempname					      \
 	getline getw putw						      \
-	remove rename
-
-ifneq (,$(filter %REENTRANT, $(defines)))
-routines += lockfile
-endif
+	remove rename							      \
+	lockfile
 
 aux	:= errlist siglist
 distribute := _itoa.h printf-parse.h
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 1316adacbf..b2523574a8 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -152,14 +152,9 @@ ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n));
 # define is_longlong is_long_double
 #endif
 
-
-#ifdef _LIBC_REENTRANT
 extern void __flockfile (FILE *);
 weak_extern (__flockfile);
 extern void __funlockfile (FILE *);
-weak_extern (__funlockfile);
-#endif
-
 
 /* Global variables.  */
 static const char null[] = "(null)";
@@ -1312,10 +1307,7 @@ do_positional:
 
 all_done:
   /* Unlock the stream.  */
-#ifdef USE_IN_LIBIO
-  /* (stdio has no locking yet.) */
   __libc_cleanup_region_end (1);
-#endif
 
   return done;
 }