From 81503d1e4449fdb334ad343f4ddc05891c6b4190 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 4 Sep 2015 16:21:14 +0000
Subject: Rename bits/stdio-lock.h to stdio-lock.h (bug 14912).

It was noted in
<https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the
bits/*.h naming scheme should only be used for installed headers.
This patch renames bits/stdio-lock.h to plain stdio-lock.h to follow
that convention.

Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by the patch).

	[BZ #14912]
	* bits/stdio-lock.h: Move to ...
	* sysdeps/generic/stdio-lock.h: ...here.
	(_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
	* sysdeps/nptl/bits/stdio-lock.h: Move to ...
	* sysdeps/nptl/stdio-lock.h: ...here.
	(_BITS_STDIO_LOCK_H): Rename macro to _STDIO_LOCK_H.
	* include/libio.h: Include <stdio-lock.h> instead of
	<bits/stdio-lock.h>.
	* sysdeps/nptl/fork.c: Likewise.
	* sysdeps/pthread/flockfile.c: Likewise.
	* sysdeps/pthread/ftrylockfile.c: Likewise.
	* sysdeps/pthread/funlockfile.c: Likewise.
---
 sysdeps/nptl/fork.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sysdeps/nptl/fork.c')

diff --git a/sysdeps/nptl/fork.c b/sysdeps/nptl/fork.c
index 2b9ae4b571..1e251bd2d4 100644
--- a/sysdeps/nptl/fork.c
+++ b/sysdeps/nptl/fork.c
@@ -25,7 +25,7 @@
 #include <tls.h>
 #include <hp-timing.h>
 #include <ldsodefs.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 #include <atomic.h>
 #include <nptl/pthreadP.h>
 #include <fork.h>
-- 
cgit 1.4.1