diff options
148 files changed, 324 insertions, 160 deletions
diff --git a/ChangeLog b/ChangeLog index f36e17460d..5f009a806d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,167 @@ +2015-09-08 Joseph Myers <joseph@codesourcery.com> + + [BZ #14912] + * bits/libc-lock.h: Move to ... + * sysdeps/generic/libc-lock.h: ...here. + (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. + * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... + * sysdeps/mach/hurd/libc-lock.h: ...here. + (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. + [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. + * sysdeps/mach/bits/libc-lock.h: Move to ... + * sysdeps/mach/libc-lock.h: ...here. + (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. + * sysdeps/nptl/bits/libc-lock.h: Move to ... + * sysdeps/nptl/libc-lock.h: ...here. + (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. + * sysdeps/nptl/bits/libc-lockP.h: Move to ... + * sysdeps/nptl/libc-lockP.h: ...here. + (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. + * crypt/crypt_util.c: Include <libc-lock.h> instead of + <bits/libc-lock.h>. + * dirent/scandir-tail.c: Likewise. + * dlfcn/dlerror.c: Likewise. + * elf/dl-close.c: Likewise. + * elf/dl-iteratephdr.c: Likewise. + * elf/dl-lookup.c: Likewise. + * elf/dl-open.c: Likewise. + * elf/dl-support.c: Likewise. + * elf/dl-writev.h: Likewise. + * elf/rtld.c: Likewise. + * grp/fgetgrent.c: Likewise. + * gshadow/fgetsgent.c: Likewise. + * gshadow/sgetsgent.c: Likewise. + * iconv/gconv_conf.c: Likewise. + * iconv/gconv_db.c: Likewise. + * iconv/gconv_dl.c: Likewise. + * iconv/gconv_int.h: Likewise. + * iconv/gconv_trans.c: Likewise. + * include/link.h: Likewise. + * inet/getnameinfo.c: Likewise. + * inet/getnetgrent.c: Likewise. + * inet/getnetgrent_r.c: Likewise. + * intl/bindtextdom.c: Likewise. + * intl/dcigettext.c: Likewise. + * intl/finddomain.c: Likewise. + * intl/gettextP.h: Likewise. + * intl/loadmsgcat.c: Likewise. + * intl/localealias.c: Likewise. + * intl/textdomain.c: Likewise. + * libidn/idn-stub.c: Likewise. + * libio/libioP.h: Likewise. + * locale/duplocale.c: Likewise. + * locale/freelocale.c: Likewise. + * locale/newlocale.c: Likewise. + * locale/setlocale.c: Likewise. + * login/getutent_r.c: Likewise. + * login/getutid_r.c: Likewise. + * login/getutline_r.c: Likewise. + * login/utmp-private.h: Likewise. + * login/utmpname.c: Likewise. + * malloc/mtrace.c: Likewise. + * misc/efgcvt.c: Likewise. + * misc/error.c: Likewise. + * misc/fstab.c: Likewise. + * misc/getpass.c: Likewise. + * misc/mntent.c: Likewise. + * misc/syslog.c: Likewise. + * nis/nis_call.c: Likewise. + * nis/nis_callback.c: Likewise. + * nis/nss-default.c: Likewise. + * nis/nss_compat/compat-grp.c: Likewise. + * nis/nss_compat/compat-initgroups.c: Likewise. + * nis/nss_compat/compat-pwd.c: Likewise. + * nis/nss_compat/compat-spwd.c: Likewise. + * nis/nss_nis/nis-alias.c: Likewise. + * nis/nss_nis/nis-ethers.c: Likewise. + * nis/nss_nis/nis-grp.c: Likewise. + * nis/nss_nis/nis-hosts.c: Likewise. + * nis/nss_nis/nis-network.c: Likewise. + * nis/nss_nis/nis-proto.c: Likewise. + * nis/nss_nis/nis-pwd.c: Likewise. + * nis/nss_nis/nis-rpc.c: Likewise. + * nis/nss_nis/nis-service.c: Likewise. + * nis/nss_nis/nis-spwd.c: Likewise. + * nis/nss_nisplus/nisplus-alias.c: Likewise. + * nis/nss_nisplus/nisplus-ethers.c: Likewise. + * nis/nss_nisplus/nisplus-grp.c: Likewise. + * nis/nss_nisplus/nisplus-hosts.c: Likewise. + * nis/nss_nisplus/nisplus-initgroups.c: Likewise. + * nis/nss_nisplus/nisplus-network.c: Likewise. + * nis/nss_nisplus/nisplus-proto.c: Likewise. + * nis/nss_nisplus/nisplus-pwd.c: Likewise. + * nis/nss_nisplus/nisplus-rpc.c: Likewise. + * nis/nss_nisplus/nisplus-service.c: Likewise. + * nis/nss_nisplus/nisplus-spwd.c: Likewise. + * nis/ypclnt.c: Likewise. + * nptl/libc_pthread_init.c: Likewise. + * nss/getXXbyYY.c: Likewise. + * nss/getXXent.c: Likewise. + * nss/getXXent_r.c: Likewise. + * nss/nss_db/db-XXX.c: Likewise. + * nss/nss_db/db-netgrp.c: Likewise. + * nss/nss_db/nss_db.h: Likewise. + * nss/nss_files/files-XXX.c: Likewise. + * nss/nss_files/files-alias.c: Likewise. + * nss/nsswitch.c: Likewise. + * posix/regex_internal.h: Likewise. + * posix/wordexp.c: Likewise. + * pwd/fgetpwent.c: Likewise. + * resolv/res_hconf.c: Likewise. + * resolv/res_libc.c: Likewise. + * shadow/fgetspent.c: Likewise. + * shadow/lckpwdf.c: Likewise. + * shadow/sgetspent.c: Likewise. + * socket/opensock.c: Likewise. + * stdio-common/reg-modifier.c: Likewise. + * stdio-common/reg-printf.c: Likewise. + * stdio-common/reg-type.c: Likewise. + * stdio-common/vfprintf.c: Likewise. + * stdio-common/vfscanf.c: Likewise. + * stdlib/abort.c: Likewise. + * stdlib/cxa_atexit.c: Likewise. + * stdlib/fmtmsg.c: Likewise. + * stdlib/random.c: Likewise. + * stdlib/setenv.c: Likewise. + * string/strsignal.c: Likewise. + * sunrpc/auth_none.c: Likewise. + * sunrpc/bindrsvprt.c: Likewise. + * sunrpc/create_xid.c: Likewise. + * sunrpc/key_call.c: Likewise. + * sunrpc/rpc_thread.c: Likewise. + * sysdeps/arm/backtrace.c: Likewise. + * sysdeps/generic/ldsodefs.h: Likewise. + * sysdeps/generic/stdio-lock.h: Likewise. + * sysdeps/generic/unwind-dw2-fde.c: Likewise. + * sysdeps/i386/backtrace.c: Likewise. + * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. + * sysdeps/m68k/backtrace.c: Likewise. + * sysdeps/mach/hurd/cthreads.c: Likewise. + * sysdeps/mach/hurd/dirstream.h: Likewise. + * sysdeps/mach/hurd/malloc-machine.h: Likewise. + * sysdeps/nptl/malloc-machine.h: Likewise. + * sysdeps/nptl/stdio-lock.h: Likewise. + * sysdeps/posix/dirstream.h: Likewise. + * sysdeps/posix/getaddrinfo.c: Likewise. + * sysdeps/posix/system.c: Likewise. + * sysdeps/pthread/aio_suspend.c: Likewise. + * sysdeps/s390/s390-32/backtrace.c: Likewise. + * sysdeps/s390/s390-64/backtrace.c: Likewise. + * sysdeps/unix/sysv/linux/check_pf.c: Likewise. + * sysdeps/unix/sysv/linux/if_index.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. + * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. + * sysdeps/unix/sysv/linux/system.c: Likewise. + * sysdeps/x86_64/backtrace.c: Likewise. + * time/alt_digit.c: Likewise. + * time/era.c: Likewise. + * time/tzset.c: Likewise. + * wcsmbs/wcsmbsload.c: Likewise. + * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> + instead of <bits/libc-lock.h> in comment. + 2015-09-08 Andrew Bennett <andrew.bennett@imgtec.com> * sysdeps/mips/bits/atomic.h [_MIPS_SIM == _ABIO32] (MIPS_PUSH_MIPS2): diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c index 1597885ed6..b96ecc8b6c 100644 --- a/crypt/crypt_util.c +++ b/crypt/crypt_util.c @@ -253,7 +253,7 @@ static const char b64t[64] = struct crypt_data _ufc_foobar; #ifdef __GNU_LIBRARY__ -#include <bits/libc-lock.h> +#include <libc-lock.h> __libc_lock_define_initialized (static, _ufc_tables_lock) #endif diff --git a/dirent/scandir-tail.c b/dirent/scandir-tail.c index 4560834af5..6b9d4e28d4 100644 --- a/dirent/scandir-tail.c +++ b/dirent/scandir-tail.c @@ -20,7 +20,7 @@ #include <errno.h> #include <stdlib.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #ifndef SCANDIR_TAIL # define SCANDIR_TAIL __scandir_tail diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c index 5d3bd03037..107736ce4d 100644 --- a/dlfcn/dlerror.c +++ b/dlfcn/dlerror.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <ldsodefs.h> #if !defined SHARED && IS_IN (libdl) diff --git a/elf/dl-close.c b/elf/dl-close.c index c8972471ee..b05a403412 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -25,7 +25,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <ldsodefs.h> #include <sys/types.h> #include <sys/mman.h> diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c index 906c9ce6f5..8871c261dc 100644 --- a/elf/dl-iteratephdr.c +++ b/elf/dl-iteratephdr.c @@ -20,7 +20,7 @@ #include <errno.h> #include <ldsodefs.h> #include <stddef.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> static void cancel_handler (void *arg __attribute__((unused))) diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 11cb44b451..581fb20e60 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -25,7 +25,7 @@ #include <dl-hash.h> #include <dl-machine.h> #include <sysdep-cancel.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <tls.h> #include <atomic.h> diff --git a/elf/dl-open.c b/elf/dl-open.c index 2db1c02148..5429d181cb 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -26,7 +26,7 @@ #include <unistd.h> #include <sys/mman.h> /* Check whether MAP_COPY is defined. */ #include <sys/param.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <ldsodefs.h> #include <caller.h> #include <sysdep-cancel.h> diff --git a/elf/dl-support.c b/elf/dl-support.c index 4d036f12dd..e7b5110b59 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -27,7 +27,7 @@ #include <stdint.h> #include <ldsodefs.h> #include <dl-machine.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <dl-cache.h> #include <dl-librecon.h> #include <dl-procinfo.h> diff --git a/elf/dl-writev.h b/elf/dl-writev.h index 3e6d2f4975..4ff2e64c48 100644 --- a/elf/dl-writev.h +++ b/elf/dl-writev.h @@ -18,7 +18,7 @@ #include <sys/uio.h> #include <ldsodefs.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* This is used from only one place: dl-misc.c:_dl_debug_vdprintf. Hence it's in a header with the expectation it will be inlined. diff --git a/elf/rtld.c b/elf/rtld.c index 69873c2368..1474c72cde 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -31,7 +31,7 @@ #include <entry.h> #include <fpu_control.h> #include <hp-timing.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "dynamic-link.h" #include <dl-librecon.h> #include <unsecvars.h> diff --git a/grp/fgetgrent.c b/grp/fgetgrent.c index 5a2fa88671..4123155a70 100644 --- a/grp/fgetgrent.c +++ b/grp/fgetgrent.c @@ -17,7 +17,7 @@ #include <errno.h> #include <grp.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdio.h> #include <stdlib.h> diff --git a/gshadow/fgetsgent.c b/gshadow/fgetsgent.c index 23aea9e680..02e0285ae8 100644 --- a/gshadow/fgetsgent.c +++ b/gshadow/fgetsgent.c @@ -16,7 +16,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <gshadow.h> #include <stdio.h> #include <stdlib.h> diff --git a/gshadow/sgetsgent.c b/gshadow/sgetsgent.c index dc643de337..5d2d269054 100644 --- a/gshadow/sgetsgent.c +++ b/gshadow/sgetsgent.c @@ -16,7 +16,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <gshadow.h> #include <stdlib.h> diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 0ba4739c41..eadbb6b5c0 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -31,7 +31,7 @@ #include <unistd.h> #include <sys/param.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <gconv_int.h> diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c index ce46216c2b..4e6ec657e2 100644 --- a/iconv/gconv_db.c +++ b/iconv/gconv_db.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <string.h> #include <sys/param.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <locale/localeinfo.h> #include <dlfcn.h> diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c index 77c9b26bd7..f8621c8872 100644 --- a/iconv/gconv_dl.c +++ b/iconv/gconv_dl.c @@ -23,7 +23,7 @@ #include <search.h> #include <stdlib.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <sys/param.h> #include <gconv_int.h> diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 162c4844a3..46a140ef4f 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -23,7 +23,7 @@ #include <stdlib.h> /* For alloca used in macro below. */ #include <ctype.h> /* For __toupper_l used in macro below. */ #include <string.h> /* For strlen et al used in macro below. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> __BEGIN_DECLS diff --git a/iconv/gconv_trans.c b/iconv/gconv_trans.c index 5d5d4d75a4..ea8081b125 100644 --- a/iconv/gconv_trans.c +++ b/iconv/gconv_trans.c @@ -24,7 +24,7 @@ #include <string.h> #include <stdlib.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "gconv_int.h" #include "../locale/localeinfo.h" diff --git a/include/link.h b/include/link.h index e44110c843..96a1771ce3 100644 --- a/include/link.h +++ b/include/link.h @@ -43,7 +43,7 @@ extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid, #include <dl-fileid.h> #include <dl-lookupcfg.h> #include <tls.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Some internal data structures of the dynamic linker used in the diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 0126f20326..40f67f082f 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -51,7 +51,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <sys/types.h> #include <sys/un.h> #include <sys/utsname.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <scratch_buffer.h> #ifdef HAVE_LIBIDN diff --git a/inet/getnetgrent.c b/inet/getnetgrent.c index 094f34f0fd..e4e3214bd1 100644 --- a/inet/getnetgrent.c +++ b/inet/getnetgrent.c @@ -18,7 +18,7 @@ #include <errno.h> #include <netdb.h> #include <stdlib.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Static buffer for return value. We allocate it when needed. */ libc_freeres_ptr (static char *buffer); diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c index 53ae648ced..00fb73fd74 100644 --- a/inet/getnetgrent_r.c +++ b/inet/getnetgrent_r.c @@ -17,7 +17,7 @@ #include <assert.h> #include <atomic.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <errno.h> #include <netdb.h> #include <stdbool.h> diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c index 887393c478..c98434be5c 100644 --- a/intl/bindtextdom.c +++ b/intl/bindtextdom.c @@ -31,7 +31,7 @@ /* Handle multi-threaded applications. */ #ifdef _LIBC -# include <bits/libc-lock.h> +# include <libc-lock.h> # define gl_rwlock_define __libc_rwlock_define # define gl_rwlock_wrlock __libc_rwlock_wrlock # define gl_rwlock_unlock __libc_rwlock_unlock diff --git a/intl/dcigettext.c b/intl/dcigettext.c index 8a3f091497..8d2269fca3 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -103,7 +103,7 @@ extern int errno; /* Handle multi-threaded applications. */ #ifdef _LIBC -# include <bits/libc-lock.h> +# include <libc-lock.h> # define gl_rwlock_define_initialized __libc_rwlock_define_initialized # define gl_rwlock_rdlock __libc_rwlock_rdlock # define gl_rwlock_wrlock __libc_rwlock_wrlock diff --git a/intl/finddomain.c b/intl/finddomain.c index a5c157f340..6ef664eb1f 100644 --- a/intl/finddomain.c +++ b/intl/finddomain.c @@ -37,7 +37,7 @@ /* Handle multi-threaded applications. */ #ifdef _LIBC -# include <bits/libc-lock.h> +# include <libc-lock.h> # define gl_rwlock_define_initialized __libc_rwlock_define_initialized # define gl_rwlock_rdlock __libc_rwlock_rdlock # define gl_rwlock_wrlock __libc_rwlock_wrlock diff --git a/intl/gettextP.h b/intl/gettextP.h index bbd213988b..a61e00f428 100644 --- a/intl/gettextP.h +++ b/intl/gettextP.h @@ -30,7 +30,7 @@ /* Handle multi-threaded applications. */ #ifdef _LIBC -# include <bits/libc-lock.h> +# include <libc-lock.h> # define gl_rwlock_define __libc_rwlock_define #else # include "lock.h" diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c index 8eb77d8fe9..bcdf73d0de 100644 --- a/intl/loadmsgcat.c +++ b/intl/loadmsgcat.c @@ -95,7 +95,7 @@ char *alloca (); /* Handle multi-threaded applications. */ #ifdef _LIBC -# include <bits/libc-lock.h> +# include <libc-lock.h> #else # include "lock.h" #endif diff --git a/intl/localealias.c b/intl/localealias.c index 687b9002ad..d6a4c97b8c 100644 --- a/intl/localealias.c +++ b/intl/localealias.c @@ -83,7 +83,7 @@ char *alloca (); /* Handle multi-threaded applications. */ #ifdef _LIBC -# include <bits/libc-lock.h> +# include <libc-lock.h> #else # include "lock.h" #endif diff --git a/intl/textdomain.c b/intl/textdomain.c index 7ccf68ee0b..eaa0cd366a 100644 --- a/intl/textdomain.c +++ b/intl/textdomain.c @@ -30,7 +30,7 @@ /* Handle multi-threaded applications. */ #ifdef _LIBC -# include <bits/libc-lock.h> +# include <libc-lock.h> # define gl_rwlock_define __libc_rwlock_define # define gl_rwlock_wrlock __libc_rwlock_wrlock # define gl_rwlock_unlock __libc_rwlock_unlock diff --git a/libidn/idn-stub.c b/libidn/idn-stub.c index afd93caed8..fb67f74b8d 100644 --- a/libidn/idn-stub.c +++ b/libidn/idn-stub.c @@ -22,7 +22,7 @@ #include <string.h> #include <dlfcn.h> #include <gnu/lib-names.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Get specification for idna_to_ascii_lz. */ #include "idna.h" diff --git a/libio/libioP.h b/libio/libioP.h index 36170ea619..b1ca774be5 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -39,7 +39,7 @@ # define __set_errno(Val) errno = (Val) #endif #if defined __GLIBC__ && __GLIBC__ >= 2 -# include <bits/libc-lock.h> +# include <libc-lock.h> #else /*# include <comthread.h>*/ #endif diff --git a/locale/duplocale.c b/locale/duplocale.c index dd048405f8..8ee07788f1 100644 --- a/locale/duplocale.c +++ b/locale/duplocale.c @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <locale.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include <string.h> diff --git a/locale/freelocale.c b/locale/freelocale.c index 51f723ec40..cd5289b4cb 100644 --- a/locale/freelocale.c +++ b/locale/freelocale.c @@ -19,7 +19,7 @@ #include <locale.h> #include <stdlib.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "localeinfo.h" diff --git a/locale/newlocale.c b/locale/newlocale.c index b495659e63..f9134cd0eb 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <argz.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <errno.h> #include <locale.h> #include <stdlib.h> diff --git a/locale/setlocale.c b/locale/setlocale.c index fa9cb3a1d6..ead030dc09 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -18,7 +18,7 @@ #include <alloca.h> #include <argz.h> #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <locale.h> #include <stdlib.h> #include <string.h> diff --git a/login/getutent_r.c b/login/getutent_r.c index 876cc518b6..b929402a2e 100644 --- a/login/getutent_r.c +++ b/login/getutent_r.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include <utmp.h> diff --git a/login/getutid_r.c b/login/getutid_r.c index 8eb555903c..42ddb4daea 100644 --- a/login/getutid_r.c +++ b/login/getutid_r.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <errno.h> #include <stdlib.h> #include <utmp.h> diff --git a/login/getutline_r.c b/login/getutline_r.c index 55fc16fc57..c51e18c9c7 100644 --- a/login/getutline_r.c +++ b/login/getutline_r.c @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <utmp.h> #include "utmp-private.h" diff --git a/login/utmp-private.h b/login/utmp-private.h index ae2cdc1a45..96356676aa 100644 --- a/login/utmp-private.h +++ b/login/utmp-private.h @@ -22,7 +22,7 @@ #define _UTMP_PRIVATE_H 1 #include <utmp.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* The structure describing the functions in a backend. */ struct utfuncs diff --git a/login/utmpname.c b/login/utmpname.c index b387edb1da..ec5c2844cb 100644 --- a/login/utmpname.c +++ b/login/utmpname.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include <string.h> #include <utmp.h> diff --git a/malloc/mtrace.c b/malloc/mtrace.c index df10128b87..9c92c12f8b 100644 --- a/malloc/mtrace.c +++ b/malloc/mtrace.c @@ -22,7 +22,7 @@ # define _MALLOC_INTERNAL # include <malloc.h> # include <mcheck.h> -# include <bits/libc-lock.h> +# include <libc-lock.h> #endif #include <dlfcn.h> diff --git a/misc/efgcvt.c b/misc/efgcvt.c index 7c7939192b..05a4253ac2 100644 --- a/misc/efgcvt.c +++ b/misc/efgcvt.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <sys/param.h> #include <float.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <math_ldbl_opt.h> #ifndef FLOAT_TYPE diff --git a/misc/error.c b/misc/error.c index aaa120d5ab..aa3054d9ee 100644 --- a/misc/error.c +++ b/misc/error.c @@ -85,7 +85,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name, # undef putc # define putc(c, fp) _IO_putc (c, fp) -# include <bits/libc-lock.h> +# include <libc-lock.h> #else /* not _LIBC */ diff --git a/misc/fstab.c b/misc/fstab.c index 2d2e93216e..97c62feb5d 100644 --- a/misc/fstab.c +++ b/misc/fstab.c @@ -20,7 +20,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #define BUFFER_SIZE 0x1fc0 diff --git a/misc/getpass.c b/misc/getpass.c index dcaff3855c..78fe8f2b53 100644 --- a/misc/getpass.c +++ b/misc/getpass.c @@ -24,7 +24,7 @@ #include <wchar.h> #define flockfile(s) _IO_flockfile (s) #define funlockfile(s) _IO_funlockfile (s) -#include <bits/libc-lock.h> +#include <libc-lock.h> /* It is desirable to use this bit on systems that have it. The only bit of terminal state we want to twiddle is echoing, which is diff --git a/misc/mntent.c b/misc/mntent.c index 7dedc62387..e372b9fa58 100644 --- a/misc/mntent.c +++ b/misc/mntent.c @@ -18,7 +18,7 @@ #include <mntent.h> #include <stdlib.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* We don't want to allocate the static buffer all the time since it is not always used (in fact, rather infrequently). Accept the diff --git a/misc/syslog.c b/misc/syslog.c index 9dd4cde18c..034e2c86f3 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94"; #include <time.h> #include <unistd.h> #include <stdlib.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <signal.h> #include <locale.h> diff --git a/nis/nis_call.c b/nis/nis_call.c index 970415b505..6bd4b411d5 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -28,7 +28,7 @@ #include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nis_xdr.h" #include "nis_intern.h" diff --git a/nis/nis_callback.c b/nis/nis_callback.c index 602ce2ff26..ef9db4b7b8 100644 --- a/nis/nis_callback.c +++ b/nis/nis_callback.c @@ -33,7 +33,7 @@ #include <rpc/key_prot.h> #include <rpcsvc/nis.h> #include <rpcsvc/nis_callback.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nis_xdr.h" #include "nis_intern.h" diff --git a/nis/nss-default.c b/nis/nss-default.c index bffac5a133..cf9e28395a 100644 --- a/nis/nss-default.c +++ b/nis/nss-default.c @@ -21,7 +21,7 @@ #include <stdio_ext.h> #include <stdlib.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <libnsl.h> diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index d8ef4be63b..dfd6e6aad8 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -25,7 +25,7 @@ #include <stdio_ext.h> #include <string.h> #include <rpc/types.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <kernel-features.h> static service_user *ni; diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c index eaff0f676c..c7d273b03c 100644 --- a/nis/nss_compat/compat-initgroups.c +++ b/nis/nss_compat/compat-initgroups.c @@ -27,7 +27,7 @@ #include <rpc/types.h> #include <sys/param.h> #include <nsswitch.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <kernel-features.h> #include <scratch_buffer.h> diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 9b1d671d17..82f86e2253 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -27,7 +27,7 @@ #include <string.h> #include <rpc/types.h> #include <rpcsvc/ypclnt.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <kernel-features.h> #include "netgroup.h" diff --git a/nis/nss_compat/compat-spwd.c b/nis/nss_compat/compat-spwd.c index 5e4bf78e47..49032352a3 100644 --- a/nis/nss_compat/compat-spwd.c +++ b/nis/nss_compat/compat-spwd.c @@ -27,7 +27,7 @@ #include <string.h> #include <rpc/types.h> #include <rpcsvc/ypclnt.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <kernel-features.h> #include "netgroup.h" diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c index 4f23118183..fe66e1317b 100644 --- a/nis/nss_nis/nis-alias.c +++ b/nis/nss_nis/nis-alias.c @@ -21,7 +21,7 @@ #include <errno.h> #include <string.h> #include <aliases.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-ethers.c b/nis/nss_nis/nis-ethers.c index 1c18d0f79d..ec621e1d13 100644 --- a/nis/nss_nis/nis-ethers.c +++ b/nis/nss_nis/nis-ethers.c @@ -20,7 +20,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> #include <netinet/ether.h> diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c index 19fe8cfc44..ed0bf02291 100644 --- a/nis/nss_nis/nis-grp.c +++ b/nis/nss_nis/nis-grp.c @@ -21,7 +21,7 @@ #include <grp.h> #include <nss.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c index 6a9e8e8c31..9cf2bc53a3 100644 --- a/nis/nss_nis/nis-hosts.c +++ b/nis/nss_nis/nis-hosts.c @@ -28,7 +28,7 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <resolv.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c index 2679f955e6..c5aea6a979 100644 --- a/nis/nss_nis/nis-network.c +++ b/nis/nss_nis/nis-network.c @@ -28,7 +28,7 @@ #include <string.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-proto.c b/nis/nss_nis/nis-proto.c index f525c6e34a..d80cea8cda 100644 --- a/nis/nss_nis/nis-proto.c +++ b/nis/nss_nis/nis-proto.c @@ -21,7 +21,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c index 9c5d39c450..63daada254 100644 --- a/nis/nss_nis/nis-pwd.c +++ b/nis/nss_nis/nis-pwd.c @@ -22,7 +22,7 @@ #include <nss.h> #include <pwd.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-rpc.c b/nis/nss_nis/nis-rpc.c index 28cf1333c7..24692f7b61 100644 --- a/nis/nss_nis/nis-rpc.c +++ b/nis/nss_nis/nis-rpc.c @@ -21,7 +21,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-service.c b/nis/nss_nis/nis-service.c index 2092588977..7660ae0782 100644 --- a/nis/nss_nis/nis-service.c +++ b/nis/nss_nis/nis-service.c @@ -21,7 +21,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c index 7a70dbe543..089edd7e6e 100644 --- a/nis/nss_nis/nis-spwd.c +++ b/nis/nss_nis/nis-spwd.c @@ -25,7 +25,7 @@ #define _nss_nis_endspent _nss_nis_endspent_XXX #include <shadow.h> #undef _nss_nis_endspent -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c index 4b9f2ffae1..1871869e46 100644 --- a/nis/nss_nisplus/nisplus-alias.c +++ b/nis/nss_nisplus/nisplus-alias.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <string.h> #include <aliases.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/nis.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-ethers.c b/nis/nss_nisplus/nisplus-ethers.c index b874ea8268..c2a1f53187 100644 --- a/nis/nss_nisplus/nisplus-ethers.c +++ b/nis/nss_nisplus/nisplus-ethers.c @@ -26,7 +26,7 @@ #include <netinet/ether.h> #include <netinet/if_ether.h> #include <rpcsvc/nis.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-grp.c b/nis/nss_nisplus/nisplus-grp.c index 49f9a34355..5a370ec2df 100644 --- a/nis/nss_nisplus/nisplus-grp.c +++ b/nis/nss_nisplus/nisplus-grp.c @@ -22,7 +22,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/nis.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c index d86e06d4bc..98b30e28ab 100644 --- a/nis/nss_nisplus/nisplus-hosts.c +++ b/nis/nss_nisplus/nisplus-hosts.c @@ -26,7 +26,7 @@ #include <arpa/inet.h> #include <netinet/in.h> #include <rpcsvc/nis.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-initgroups.c b/nis/nss_nisplus/nisplus-initgroups.c index 0fc9b7e358..d963440206 100644 --- a/nis/nss_nisplus/nisplus-initgroups.c +++ b/nis/nss_nisplus/nisplus-initgroups.c @@ -21,7 +21,7 @@ #include <ctype.h> #include <errno.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/nis.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c index e3218cd683..1635fb2b56 100644 --- a/nis/nss_nisplus/nisplus-network.c +++ b/nis/nss_nisplus/nisplus-network.c @@ -25,7 +25,7 @@ #include <string.h> #include <arpa/inet.h> #include <rpcsvc/nis.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-proto.c b/nis/nss_nisplus/nisplus-proto.c index 85997cd15e..ca07cdb7c0 100644 --- a/nis/nss_nisplus/nisplus-proto.c +++ b/nis/nss_nisplus/nisplus-proto.c @@ -23,7 +23,7 @@ #include <nss.h> #include <string.h> #include <rpcsvc/nis.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c index b8eaa10ffe..4ed4914334 100644 --- a/nis/nss_nisplus/nisplus-pwd.c +++ b/nis/nss_nisplus/nisplus-pwd.c @@ -21,7 +21,7 @@ #include <errno.h> #include <pwd.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/nis.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-rpc.c b/nis/nss_nisplus/nisplus-rpc.c index 3273cf858a..67fc4cb45c 100644 --- a/nis/nss_nisplus/nisplus-rpc.c +++ b/nis/nss_nisplus/nisplus-rpc.c @@ -23,7 +23,7 @@ #include <string.h> #include <rpc/netdb.h> #include <rpcsvc/nis.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-service.c b/nis/nss_nisplus/nisplus-service.c index 05055e5735..2baef0ed56 100644 --- a/nis/nss_nisplus/nisplus-service.c +++ b/nis/nss_nisplus/nisplus-service.c @@ -23,7 +23,7 @@ #include <nss.h> #include <string.h> #include <rpcsvc/nis.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nss-nisplus.h" diff --git a/nis/nss_nisplus/nisplus-spwd.c b/nis/nss_nisplus/nisplus-spwd.c index 91e539b5c0..e87a61f690 100644 --- a/nis/nss_nisplus/nisplus-spwd.c +++ b/nis/nss_nisplus/nisplus-spwd.c @@ -20,7 +20,7 @@ #include <errno.h> #include <shadow.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpcsvc/nis.h> #include "nss-nisplus.h" diff --git a/nis/ypclnt.c b/nis/ypclnt.c index de8c1ffbaa..3a738726b4 100644 --- a/nis/ypclnt.c +++ b/nis/ypclnt.c @@ -28,7 +28,7 @@ #include <rpcsvc/ypupd.h> #include <sys/socket.h> #include <sys/uio.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* This should only be defined on systems with a BSD compatible ypbind */ #ifndef BINDINGDIR diff --git a/nptl/libc_pthread_init.c b/nptl/libc_pthread_init.c index 18844ad72b..d7f4eb0b89 100644 --- a/nptl/libc_pthread_init.c +++ b/nptl/libc_pthread_init.c @@ -23,7 +23,7 @@ #include <tls.h> #include <string.h> #include <pthreadP.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <sysdep.h> #include <ldsodefs.h> diff --git a/nptl/tst-initializers1.c b/nptl/tst-initializers1.c index 5119ebfcb5..e8175f9e53 100644 --- a/nptl/tst-initializers1.c +++ b/nptl/tst-initializers1.c @@ -46,9 +46,9 @@ do_test (void) if (rwl_writer.__data.__flags != PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP) return 6; - /* <bits/libc-lock.h> __libc_rwlock_init definition for libc.so + /* <libc-lock.h> __libc_rwlock_init definition for libc.so relies on PTHREAD_RWLOCK_INITIALIZER being all zeros. If - that ever changes, <bits/libc-lock.h> needs updating. */ + that ever changes, <libc-lock.h> needs updating. */ size_t i; for (i = 0; i < sizeof (rwl_normal); i++) if (((char *) &rwl_normal)[i] != '\0') diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c index 15fecf8491..181f45c100 100644 --- a/nss/getXXbyYY.c +++ b/nss/getXXbyYY.c @@ -17,7 +17,7 @@ #include <assert.h> #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include <resolv.h> diff --git a/nss/getXXent.c b/nss/getXXent.c index e1c796da01..84bc071e4f 100644 --- a/nss/getXXent.c +++ b/nss/getXXent.c @@ -16,7 +16,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include "nsswitch.h" diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c index 16334581c2..36fb5a059b 100644 --- a/nss/getXXent_r.c +++ b/nss/getXXent_r.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nsswitch.h" diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c index 4a0766ab52..314edc9431 100644 --- a/nss/nss_db/db-XXX.c +++ b/nss/nss_db/db-XXX.c @@ -20,7 +20,7 @@ #include <fcntl.h> #include <stdint.h> #include <sys/mman.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nsswitch.h" #include "nss_db.h" diff --git a/nss/nss_db/db-netgrp.c b/nss/nss_db/db-netgrp.c index 94d6adac68..6ee13d7d66 100644 --- a/nss/nss_db/db-netgrp.c +++ b/nss/nss_db/db-netgrp.c @@ -24,7 +24,7 @@ #include <netgroup.h> #include <string.h> #include <stdint.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <paths.h> #include <stdlib.h> diff --git a/nss/nss_db/nss_db.h b/nss/nss_db/nss_db.h index 4af2229ac1..8e45685a19 100644 --- a/nss/nss_db/nss_db.h +++ b/nss/nss_db/nss_db.h @@ -21,7 +21,7 @@ #include <nss.h> #include <stdint.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* String table index type. */ diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c index f002f431e5..cca4322c93 100644 --- a/nss/nss_files/files-XXX.c +++ b/nss/nss_files/files-XXX.c @@ -20,7 +20,7 @@ #include <ctype.h> #include <errno.h> #include <fcntl.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nsswitch.h" #include <kernel-features.h> diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c index 071c01d158..c883ebe9ec 100644 --- a/nss/nss_files/files-alias.c +++ b/nss/nss_files/files-alias.c @@ -21,7 +21,7 @@ #include <ctype.h> #include <errno.h> #include <fcntl.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 9712623157..faf9d1a0d5 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -20,7 +20,7 @@ #include <dlfcn.h> #include <errno.h> #include <netdb.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <search.h> #include <stdio.h> #include <stdio_ext.h> diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 154e96999d..1e155e350d 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -45,7 +45,7 @@ # include <stdint.h> #endif /* HAVE_STDINT_H || _LIBC */ #if defined _LIBC -# include <bits/libc-lock.h> +# include <libc-lock.h> #else # define __libc_lock_define(CLASS,NAME) # define __libc_lock_init(NAME) do { } while (0) diff --git a/posix/wordexp.c b/posix/wordexp.c index e711d43355..49ab71d6c2 100644 --- a/posix/wordexp.c +++ b/posix/wordexp.c @@ -42,7 +42,7 @@ #include <wordexp.h> #include <kernel-features.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <_itoa.h> /* Undefine the following line for the production version. */ diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c index d869ee25b1..009cb12714 100644 --- a/pwd/fgetpwent.c +++ b/pwd/fgetpwent.c @@ -16,7 +16,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <pwd.h> #include <stdio.h> #include <stdlib.h> diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index 0d4f3f45bc..692d948308 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -41,7 +41,7 @@ #include <sys/ioctl.h> #include <unistd.h> #include <netinet/in.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "ifreq.h" #include "res_hconf.h" #include <wchar.h> diff --git a/resolv/res_libc.c b/resolv/res_libc.c index ee3fa2114b..a8394e0e7b 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -21,7 +21,7 @@ #include <netinet/in.h> #include <arpa/nameser.h> #include <resolv.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* The following bit is copied from res_data.c (where it is #ifdef'ed diff --git a/shadow/fgetspent.c b/shadow/fgetspent.c index 38977ea853..b439024909 100644 --- a/shadow/fgetspent.c +++ b/shadow/fgetspent.c @@ -16,7 +16,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <shadow.h> #include <stdio.h> #include <stdlib.h> diff --git a/shadow/lckpwdf.c b/shadow/lckpwdf.c index e435471564..90d48bd100 100644 --- a/shadow/lckpwdf.c +++ b/shadow/lckpwdf.c @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ #include <fcntl.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <shadow.h> #include <signal.h> #include <string.h> diff --git a/shadow/sgetspent.c b/shadow/sgetspent.c index f16ff19a59..762dcb5959 100644 --- a/shadow/sgetspent.c +++ b/shadow/sgetspent.c @@ -16,7 +16,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <shadow.h> #include <stdlib.h> diff --git a/socket/opensock.c b/socket/opensock.c index 31f247eb40..dddba8e82f 100644 --- a/socket/opensock.c +++ b/socket/opensock.c @@ -17,7 +17,7 @@ #include <stdio.h> #include <sys/socket.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Return a socket of any type. The socket can be used in subsequent ioctl calls to talk to the kernel. */ diff --git a/stdio-common/reg-modifier.c b/stdio-common/reg-modifier.c index 0bb04b3b4b..039023921b 100644 --- a/stdio-common/reg-modifier.c +++ b/stdio-common/reg-modifier.c @@ -20,7 +20,7 @@ #include <printf.h> #include <stdlib.h> #include <wchar.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> struct printf_modifier_record diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c index b7226f4d9c..ed326e2c3b 100644 --- a/stdio-common/reg-printf.c +++ b/stdio-common/reg-printf.c @@ -20,7 +20,7 @@ #include <printf.h> #include <stddef.h> #include <stdlib.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Array of functions indexed by format character. */ diff --git a/stdio-common/reg-type.c b/stdio-common/reg-type.c index d02b5a2e75..65c1705372 100644 --- a/stdio-common/reg-type.c +++ b/stdio-common/reg-type.c @@ -18,7 +18,7 @@ #include <errno.h> #include <printf.h> #include <stdlib.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Array of functions indexed by format character. */ diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index 0592e70603..4b1bb8feb5 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -24,7 +24,7 @@ #include <string.h> #include <errno.h> #include <wchar.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <sys/param.h> #include <_itoa.h> #include <locale/localeinfo.h> diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 0e204e7b32..9d9ff2094c 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -27,7 +27,7 @@ #include <string.h> #include <wchar.h> #include <wctype.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <locale/localeinfo.h> #ifdef __GNUC__ diff --git a/stdlib/abort.c b/stdlib/abort.c index ffde8145db..3b4bdba3f2 100644 --- a/stdlib/abort.c +++ b/stdlib/abort.c @@ -15,7 +15,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> diff --git a/stdlib/cxa_atexit.c b/stdlib/cxa_atexit.c index 6e38c64fbe..c2937628b1 100644 --- a/stdlib/cxa_atexit.c +++ b/stdlib/cxa_atexit.c @@ -19,7 +19,7 @@ #include <stdlib.h> #include <stdint.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "exit.h" #include <atomic.h> #include <sysdep.h> diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c index b8133dca4d..a7abcbba8c 100644 --- a/stdlib/fmtmsg.c +++ b/stdlib/fmtmsg.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <fmtmsg.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdio.h> #include <stdint.h> #include <stdlib.h> diff --git a/stdlib/random.c b/stdlib/random.c index 7c033df9aa..0c9e02e3b7 100644 --- a/stdlib/random.c +++ b/stdlib/random.c @@ -50,7 +50,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <limits.h> #include <stddef.h> #include <stdlib.h> diff --git a/stdlib/setenv.c b/stdlib/setenv.c index b9e0ba808d..dad7e71620 100644 --- a/stdlib/setenv.c +++ b/stdlib/setenv.c @@ -57,7 +57,7 @@ extern char **environ; #if _LIBC /* This lock protects against simultaneous modifications of `environ'. */ -# include <bits/libc-lock.h> +# include <libc-lock.h> __libc_lock_define_initialized (static, envlock) # define LOCK __libc_lock_lock (envlock) # define UNLOCK __libc_lock_unlock (envlock) diff --git a/string/strsignal.c b/string/strsignal.c index 01c01e2dc7..1b0d164c7e 100644 --- a/string/strsignal.c +++ b/string/strsignal.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <string.h> #include <libintl.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> static __libc_key_t key; diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c index 3af5966794..3f8d52bafb 100644 --- a/sunrpc/auth_none.c +++ b/sunrpc/auth_none.c @@ -35,7 +35,7 @@ */ #include <rpc/rpc.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #define MAX_MARSHAL_SIZE 20 diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c index e6a1b0b0b3..13bcb27d4d 100644 --- a/sunrpc/bindrsvprt.c +++ b/sunrpc/bindrsvprt.c @@ -35,7 +35,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* * Locks the static variables in this file. diff --git a/sunrpc/create_xid.c b/sunrpc/create_xid.c index 65182eec88..2f784824da 100644 --- a/sunrpc/create_xid.c +++ b/sunrpc/create_xid.c @@ -19,7 +19,7 @@ #include <unistd.h> #include <stdlib.h> #include <sys/time.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpc/rpc.h> /* The RPC code is not threadsafe, but new code should be threadsafe. */ diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index e0a076b47f..7ecf6fbaa1 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -48,7 +48,7 @@ #include <sys/param.h> #include <sys/socket.h> #include <rpc/key_prot.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #define KEY_TIMEOUT 5 /* per-try timeout in seconds */ #define KEY_NRETRY 12 /* number of retries */ diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c index 5910ea7710..2b93db40fc 100644 --- a/sunrpc/rpc_thread.c +++ b/sunrpc/rpc_thread.c @@ -1,9 +1,9 @@ #include <stdio.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <rpc/rpc.h> #include <assert.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <libc-tsd.h> #ifdef _RPC_THREAD_SAFE_ diff --git a/sysdeps/arm/backtrace.c b/sysdeps/arm/backtrace.c index 5a30c209ff..b19def6e0b 100644 --- a/sysdeps/arm/backtrace.c +++ b/sysdeps/arm/backtrace.c @@ -17,7 +17,7 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <dlfcn.h> #include <execinfo.h> #include <stdlib.h> diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 7a0fe8dbe4..7f7ff72f88 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -35,7 +35,7 @@ #include <link.h> #include <dl-lookupcfg.h> #include <dl-sysdep.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <hp-timing.h> #include <tls.h> diff --git a/bits/libc-lock.h b/sysdeps/generic/libc-lock.h index 4e7636b082..f05f88878a 100644 --- a/bits/libc-lock.h +++ b/sysdeps/generic/libc-lock.h @@ -16,8 +16,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_LIBC_LOCK_H -#define _BITS_LIBC_LOCK_H 1 +#ifndef _LIBC_LOCK_H +#define _LIBC_LOCK_H 1 /* Define a lock variable NAME with storage class CLASS. The lock must be @@ -137,4 +137,4 @@ typedef int __libc_key_t; /* Get thread-specific data associated with KEY. */ #define __libc_getspecific(KEY) ((void) (KEY), (void *) 0) -#endif /* bits/libc-lock.h */ +#endif /* libc-lock.h */ diff --git a/sysdeps/generic/stdio-lock.h b/sysdeps/generic/stdio-lock.h index 620e207f80..38f93efce9 100644 --- a/sysdeps/generic/stdio-lock.h +++ b/sysdeps/generic/stdio-lock.h @@ -19,7 +19,7 @@ #ifndef _STDIO_LOCK_H #define _STDIO_LOCK_H 1 -#include <bits/libc-lock.h> +#include <libc-lock.h> __libc_lock_define_recursive (typedef, _IO_lock_t) diff --git a/sysdeps/generic/unwind-dw2-fde.c b/sysdeps/generic/unwind-dw2-fde.c index 1da37ab508..6db9aeaffc 100644 --- a/sysdeps/generic/unwind-dw2-fde.c +++ b/sysdeps/generic/unwind-dw2-fde.c @@ -27,7 +27,7 @@ #ifdef _LIBC #include <stdlib.h> #include <string.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <dwarf2.h> #include <unwind.h> #define NO_BASE_OF_ENCODED_VALUE diff --git a/sysdeps/i386/backtrace.c b/sysdeps/i386/backtrace.c index f10ed566dc..a1b4d33322 100644 --- a/sysdeps/i386/backtrace.c +++ b/sysdeps/i386/backtrace.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <dlfcn.h> #include <execinfo.h> #include <stdlib.h> diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c index 0198886758..0f0e20bf11 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c @@ -25,7 +25,7 @@ #include <monetary.h> #include <locale/localeinfo.h> #include <sys/syslog.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "nldbl-compat.h" diff --git a/sysdeps/m68k/backtrace.c b/sysdeps/m68k/backtrace.c index ca7d25929e..982b4b82df 100644 --- a/sysdeps/m68k/backtrace.c +++ b/sysdeps/m68k/backtrace.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <dlfcn.h> #include <execinfo.h> #include <stdlib.h> diff --git a/sysdeps/mach/hurd/cthreads.c b/sysdeps/mach/hurd/cthreads.c index e213819a5a..695a243395 100644 --- a/sysdeps/mach/hurd/cthreads.c +++ b/sysdeps/mach/hurd/cthreads.c @@ -15,7 +15,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <errno.h> #include <stdlib.h> diff --git a/sysdeps/mach/hurd/dirstream.h b/sysdeps/mach/hurd/dirstream.h index 7edd23afd0..81220ad076 100644 --- a/sysdeps/mach/hurd/dirstream.h +++ b/sysdeps/mach/hurd/dirstream.h @@ -19,7 +19,7 @@ #define _DIRSTREAM_H 1 -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Directory stream type. diff --git a/sysdeps/mach/hurd/bits/libc-lock.h b/sysdeps/mach/hurd/libc-lock.h index 63d3e8179a..b67a049bca 100644 --- a/sysdeps/mach/hurd/bits/libc-lock.h +++ b/sysdeps/mach/hurd/libc-lock.h @@ -16,8 +16,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_LIBC_LOCK_H -#define _BITS_LIBC_LOCK_H 1 +#ifndef _LIBC_LOCK_H +#define _LIBC_LOCK_H 1 #if (_LIBC - 0) || (_CTHREADS_ - 0) #include <cthreads.h> @@ -206,7 +206,7 @@ void *__libc_getspecific (__libc_key_t key); /* Hide the definitions which are only supposed to be used inside libc in a separate file. This file is not present in the installation! */ #ifdef _LIBC -# include <bits/libc-lockP.h> +# include <libc-lockP.h> #endif -#endif /* bits/libc-lock.h */ +#endif /* libc-lock.h */ diff --git a/sysdeps/mach/hurd/malloc-machine.h b/sysdeps/mach/hurd/malloc-machine.h index ba8b60dee8..1fdbd3de93 100644 --- a/sysdeps/mach/hurd/malloc-machine.h +++ b/sysdeps/mach/hurd/malloc-machine.h @@ -23,7 +23,7 @@ #undef thread_atfork_static #include <atomic.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Assume hurd, with cthreads */ diff --git a/sysdeps/mach/bits/libc-lock.h b/sysdeps/mach/libc-lock.h index 9fad433c86..e1fc4596cd 100644 --- a/sysdeps/mach/bits/libc-lock.h +++ b/sysdeps/mach/libc-lock.h @@ -16,8 +16,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_LIBC_LOCK_H -#define _BITS_LIBC_LOCK_H 1 +#ifndef _LIBC_LOCK_H +#define _LIBC_LOCK_H 1 #ifdef _LIBC #include <cthreads.h> @@ -142,4 +142,4 @@ void *__libc_getspecific (__libc_key_t key); #define __rtld_lock_unlock_recursive __libc_lock_unlock #define __rtld_lock_lock_recursive __libc_lock_lock -#endif /* bits/libc-lock.h */ +#endif /* libc-lock.h */ diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/libc-lock.h index 5599cf1734..4db5f1b41d 100644 --- a/sysdeps/nptl/bits/libc-lock.h +++ b/sysdeps/nptl/libc-lock.h @@ -16,8 +16,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_LIBC_LOCK_H -#define _BITS_LIBC_LOCK_H 1 +#ifndef _LIBC_LOCK_H +#define _LIBC_LOCK_H 1 #include <pthread.h> #define __need_NULL @@ -184,4 +184,4 @@ extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer # include "libc-lockP.h" #endif -#endif /* bits/libc-lock.h */ +#endif /* libc-lock.h */ diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/libc-lockP.h index f55f6212ec..a64daca008 100644 --- a/sysdeps/nptl/bits/libc-lockP.h +++ b/sysdeps/nptl/libc-lockP.h @@ -16,8 +16,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BITS_LIBC_LOCKP_H -#define _BITS_LIBC_LOCKP_H 1 +#ifndef _LIBC_LOCKP_H +#define _LIBC_LOCKP_H 1 #include <pthread.h> #define __need_NULL @@ -433,4 +433,4 @@ weak_extern (pthread_setcancelstate) # endif #endif -#endif /* bits/libc-lockP.h */ +#endif /* libc-lockP.h */ diff --git a/sysdeps/nptl/malloc-machine.h b/sysdeps/nptl/malloc-machine.h index a3d10892bf..c0ec49ee56 100644 --- a/sysdeps/nptl/malloc-machine.h +++ b/sysdeps/nptl/malloc-machine.h @@ -23,7 +23,7 @@ #undef thread_atfork_static #include <atomic.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> __libc_lock_define (typedef, mutex_t) diff --git a/sysdeps/nptl/stdio-lock.h b/sysdeps/nptl/stdio-lock.h index 9406eaa045..51d123a1fc 100644 --- a/sysdeps/nptl/stdio-lock.h +++ b/sysdeps/nptl/stdio-lock.h @@ -19,7 +19,7 @@ #ifndef _STDIO_LOCK_H #define _STDIO_LOCK_H 1 -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <lowlevellock.h> diff --git a/sysdeps/posix/dirstream.h b/sysdeps/posix/dirstream.h index c7e1a5af5c..70cc77dd9c 100644 --- a/sysdeps/posix/dirstream.h +++ b/sysdeps/posix/dirstream.h @@ -20,7 +20,7 @@ #include <sys/types.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* Directory stream type. diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 31bb7e66dc..1ef3f20d98 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -58,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <sys/utsname.h> #include <unistd.h> #include <nsswitch.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <not-cancel.h> #include <nscd/nscd-client.h> #include <nscd/nscd_proto.h> diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c index 95b91abec4..84401a07d4 100644 --- a/sysdeps/posix/system.c +++ b/sysdeps/posix/system.c @@ -22,7 +22,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/wait.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <sysdep-cancel.h> diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c index 641eafb1bd..bfca6627f1 100644 --- a/sysdeps/pthread/aio_suspend.c +++ b/sysdeps/pthread/aio_suspend.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <sys/time.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <aio_misc.h> diff --git a/sysdeps/s390/s390-32/backtrace.c b/sysdeps/s390/s390-32/backtrace.c index 4e5e1feee6..5b5738cae7 100644 --- a/sysdeps/s390/s390-32/backtrace.c +++ b/sysdeps/s390/s390-32/backtrace.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <dlfcn.h> #include <execinfo.h> #include <stddef.h> diff --git a/sysdeps/s390/s390-64/backtrace.c b/sysdeps/s390/s390-64/backtrace.c index 184a73741b..e4d7efe2a3 100644 --- a/sysdeps/s390/s390-64/backtrace.c +++ b/sysdeps/s390/s390-64/backtrace.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <dlfcn.h> #include <execinfo.h> #include <stddef.h> diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c index 162606d7ab..f072fb3de7 100644 --- a/sysdeps/unix/sysv/linux/check_pf.c +++ b/sysdeps/unix/sysv/linux/check_pf.c @@ -32,7 +32,7 @@ #include <linux/rtnetlink.h> #include <not-cancel.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <atomic.h> #include <nscd/nscd-client.h> diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c index 04bf54e5ad..8ee55d9450 100644 --- a/sysdeps/unix/sysv/linux/if_index.c +++ b/sysdeps/unix/sysv/linux/if_index.c @@ -24,7 +24,7 @@ #include <net/if.h> #include <sys/socket.h> #include <sys/ioctl.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <not-cancel.h> #include "netlinkaccess.h" diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c index c00583ed0b..70b2a2d952 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include <utmp.h> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c index 20f09cdef2..c8da99cea9 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <errno.h> #include <stdlib.h> #include <utmp.h> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c index e9b215e5e5..c640239d20 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <utmp.h> #include "utmp-compat.h" diff --git a/sysdeps/unix/sysv/linux/shm-directory.c b/sysdeps/unix/sysv/linux/shm-directory.c index c1ef38a9ea..9c32051979 100644 --- a/sysdeps/unix/sysv/linux/shm-directory.c +++ b/sysdeps/unix/sysv/linux/shm-directory.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <string.h> #include <sys/statfs.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include "linux_fsinfo.h" diff --git a/sysdeps/unix/sysv/linux/system.c b/sysdeps/unix/sysv/linux/system.c index 12d6d191d8..73833e6e13 100644 --- a/sysdeps/unix/sysv/linux/system.c +++ b/sysdeps/unix/sysv/linux/system.c @@ -21,7 +21,7 @@ #include <sysdep.h> #include <unistd.h> #include <sys/wait.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* We have to and actually can handle cancelable system(). The big problem: we have to kill the child process if necessary. To do diff --git a/sysdeps/x86_64/backtrace.c b/sysdeps/x86_64/backtrace.c index 21448c8f1c..04a4e82436 100644 --- a/sysdeps/x86_64/backtrace.c +++ b/sysdeps/x86_64/backtrace.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <dlfcn.h> #include <execinfo.h> #include <stdlib.h> diff --git a/time/alt_digit.c b/time/alt_digit.c index 81fb77b9cf..bbd1ee4ccb 100644 --- a/time/alt_digit.c +++ b/time/alt_digit.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include "../locale/localeinfo.h" -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include <wchar.h> #include <string.h> diff --git a/time/era.c b/time/era.c index d6dc489d69..ec4b7687b0 100644 --- a/time/era.c +++ b/time/era.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #include "../locale/localeinfo.h" -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdlib.h> #include <wchar.h> #include <string.h> diff --git a/time/tzset.c b/time/tzset.c index 160f5ad460..01b76b47de 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -17,7 +17,7 @@ #include <ctype.h> #include <errno.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> #include <stdbool.h> #include <stddef.h> #include <stdio.h> diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index 6bb49bc996..5c3df012be 100644 --- a/wcsmbs/wcsmbsload.c +++ b/wcsmbs/wcsmbsload.c @@ -24,7 +24,7 @@ #include <locale/localeinfo.h> #include <wcsmbsload.h> -#include <bits/libc-lock.h> +#include <libc-lock.h> /* These are the descriptions for the default conversion functions. */ |