diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-09-04 16:21:14 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-09-04 16:21:14 +0000 |
| commit | 81503d1e4449fdb334ad343f4ddc05891c6b4190 (patch) | |
| tree | 7a16671eb543edb24c014630dbc4dcfc7b0b70de /sysdeps/nptl | |
| parent | 0f4341fbec937b26b34e0ee80ab903825c0c76d0 (diff) | |
| download | glibc-81503d1e4449fdb334ad343f4ddc05891c6b4190.tar.gz glibc-81503d1e4449fdb334ad343f4ddc05891c6b4190.tar.xz 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 'sysdeps/nptl')
| -rw-r--r-- | sysdeps/nptl/fork.c | 2 | ||||
| -rw-r--r-- | sysdeps/nptl/stdio-lock.h (renamed from sysdeps/nptl/bits/stdio-lock.h) | 6 |
2 files changed, 4 insertions, 4 deletions
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> diff --git a/sysdeps/nptl/bits/stdio-lock.h b/sysdeps/nptl/stdio-lock.h index 8adf0319c4..9406eaa045 100644 --- a/sysdeps/nptl/bits/stdio-lock.h +++ b/sysdeps/nptl/stdio-lock.h @@ -16,8 +16,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_STDIO_LOCK_H -#define _BITS_STDIO_LOCK_H 1 +#ifndef _STDIO_LOCK_H +#define _STDIO_LOCK_H 1 #include <bits/libc-lock.h> #include <lowlevellock.h> @@ -107,4 +107,4 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t; #endif -#endif /* bits/stdio-lock.h */ +#endif /* stdio-lock.h */ |