2015-09-04 Joseph Myers <joseph@codesourcery.com>
[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.
+
+ [BZ #14912]
* sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Move to ...
* sysdeps/unix/sysv/linux/m68k/m68k-vdso.h: ...here.
* sysdeps/unix/sysv/linux/m68k/coldfire/bits/atomic.h: Include
#if !defined _ISOMAC && defined _IO_MTSAFE_IO
-# include <bits/stdio-lock.h>
+# include <stdio-lock.h>
#endif
#include <libio/libio.h>
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>
_IO_cleanup_region_end (0)
#endif
-#endif /* bits/stdio-lock.h */
+#endif /* stdio-lock.h */
#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>
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>
#endif
-#endif /* bits/stdio-lock.h */
+#endif /* stdio-lock.h */
#include <pthread.h>
#include <stdio.h>
#include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
void
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
int
#include <pthread.h>
#include <stdio.h>
#include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
void