aboutsummaryrefslogtreecommitdiff
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 /include/libio.h
parentRename bits/m68k-vdso.h to m68k-vdso.h (bug 14912). (diff)
downloadglibc-81503d1e4449fdb334ad343f4ddc05891c6b4190.tar.gz
glibc-81503d1e4449fdb334ad343f4ddc05891c6b4190.tar.bz2
glibc-81503d1e4449fdb334ad343f4ddc05891c6b4190.zip
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 'include/libio.h')
-rw-r--r--include/libio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/libio.h b/include/libio.h
index f8a346a09a..97fc5b548b 100644
--- a/include/libio.h
+++ b/include/libio.h
@@ -1,5 +1,5 @@
#if !defined _ISOMAC && defined _IO_MTSAFE_IO
-# include <bits/stdio-lock.h>
+# include <stdio-lock.h>
#endif
#include <libio/libio.h>