aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/pthread
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-09-04 16:21:14 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-09-04 16:21:14 +0000
commit81503d1e4449fdb334ad343f4ddc05891c6b4190 (patch)
tree7a16671eb543edb24c014630dbc4dcfc7b0b70de /sysdeps/pthread
parent0f4341fbec937b26b34e0ee80ab903825c0c76d0 (diff)
downloadglibc-81503d1e4449fdb334ad343f4ddc05891c6b4190.zip
glibc-81503d1e4449fdb334ad343f4ddc05891c6b4190.tar.gz
glibc-81503d1e4449fdb334ad343f4ddc05891c6b4190.tar.bz2
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.
Diffstat (limited to 'sysdeps/pthread')
-rw-r--r--sysdeps/pthread/flockfile.c2
-rw-r--r--sysdeps/pthread/ftrylockfile.c2
-rw-r--r--sysdeps/pthread/funlockfile.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c
index c5c1ed8..3894656 100644
--- a/sysdeps/pthread/flockfile.c
+++ b/sysdeps/pthread/flockfile.c
@@ -19,7 +19,7 @@
#include <pthread.h>
#include <stdio.h>
#include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
void
diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c
index 14dc764..9ee0839 100644
--- a/sysdeps/pthread/ftrylockfile.c
+++ b/sysdeps/pthread/ftrylockfile.c
@@ -19,7 +19,7 @@
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
int
diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c
index 59172c3..d33f7b0 100644
--- a/sysdeps/pthread/funlockfile.c
+++ b/sysdeps/pthread/funlockfile.c
@@ -19,7 +19,7 @@
#include <pthread.h>
#include <stdio.h>
#include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
void