diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | include/libio.h | 2 | ||||
| -rw-r--r-- | sysdeps/generic/stdio-lock.h (renamed from bits/stdio-lock.h) | 6 | ||||
| -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 | ||||
| -rw-r--r-- | sysdeps/pthread/flockfile.c | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/ftrylockfile.c | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/funlockfile.c | 2 |
8 files changed, 25 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index d583493622..5bab6139f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,20 @@ 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 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> diff --git a/bits/stdio-lock.h b/sysdeps/generic/stdio-lock.h index 0c5bb65c45..620e207f80 100644 --- a/bits/stdio-lock.h +++ b/sysdeps/generic/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> @@ -54,4 +54,4 @@ __libc_lock_define_recursive (typedef, _IO_lock_t) _IO_cleanup_region_end (0) #endif -#endif /* bits/stdio-lock.h */ +#endif /* stdio-lock.h */ 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 */ diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c index c5c1ed8754..3894656747 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 14dc764028..9ee0839882 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 59172c3bb8..d33f7b0a56 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 |