diff options
author | Zack Weinberg <zackw@panix.com> | 2017-02-26 20:17:52 -0500 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2017-03-01 20:33:46 -0500 |
commit | 9090848d0607e93fb08a1d68d9f263846ee33f02 (patch) | |
tree | d6cd846fff1640a49ef071cfd0bfabb8efa5352c /sysdeps/unix | |
parent | 5e4e10636cf999c251b623c3be143a22156721d6 (diff) | |
download | glibc-9090848d0607e93fb08a1d68d9f263846ee33f02.tar.gz glibc-9090848d0607e93fb08a1d68d9f263846ee33f02.tar.xz glibc-9090848d0607e93fb08a1d68d9f263846ee33f02.zip |
Narrowing the visibility of libc-internal.h even further.
posix/wordexp-test.c used libc-internal.h for PTR_ALIGN_DOWN; similar to what was done with libc-diag.h, I have split the definitions of cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN to a new header, libc-pointer-arith.h. It then occurred to me that the remaining declarations in libc-internal.h are mostly to do with early initialization, and probably most of the files including it, even in the core code, don't need it anymore. Indeed, only 19 files actually need what remains of libc-internal.h. 23 others need libc-diag.h instead, and 12 need libc-pointer-arith.h instead. No file needs more than one of them, and 16 don't need any of them! So, with this patch, libc-internal.h stops including libc-diag.h as well as losing the pointer arithmetic macros, and all including files are adjusted. * include/libc-pointer-arith.h: New file. Define cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN here. * include/libc-internal.h: Definitions of above macros moved from here. Don't include libc-diag.h anymore either. * posix/wordexp-test.c: Include stdint.h and libc-pointer-arith.h. Don't include libc-internal.h. * debug/pcprofile.c, elf/dl-tunables.c, elf/soinit.c, io/openat.c * io/openat64.c, misc/ptrace.c, nptl/pthread_clock_gettime.c * nptl/pthread_clock_settime.c, nptl/pthread_cond_common.c * string/strcoll_l.c, sysdeps/nacl/brk.c * sysdeps/unix/clock_settime.c * sysdeps/unix/sysv/linux/i386/get_clockfreq.c * sysdeps/unix/sysv/linux/ia64/get_clockfreq.c * sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Don't include libc-internal.h. * elf/get-dynamic-info.h, iconv/loop.c * iconvdata/iso-2022-cn-ext.c, locale/weight.h, locale/weightwc.h * misc/reboot.c, nis/nis_table.c, nptl_db/thread_dbP.h * nscd/connections.c, resolv/res_send.c, soft-fp/fmadf4.c * soft-fp/fmasf4.c, soft-fp/fmatf4.c, stdio-common/vfscanf.c * sysdeps/ieee754/dbl-64/e_lgamma_r.c * sysdeps/ieee754/dbl-64/k_rem_pio2.c * sysdeps/ieee754/flt-32/e_lgammaf_r.c * sysdeps/ieee754/flt-32/k_rem_pio2f.c * sysdeps/ieee754/ldbl-128/k_tanl.c * sysdeps/ieee754/ldbl-128ibm/k_tanl.c * sysdeps/ieee754/ldbl-96/e_lgammal_r.c * sysdeps/ieee754/ldbl-96/k_tanl.c, sysdeps/nptl/futex-internal.h: Include libc-diag.h instead of libc-internal.h. * elf/dl-load.c, elf/dl-reloc.c, locale/programs/locarchive.c * nptl/nptl-init.c, string/strcspn.c, string/strspn.c * malloc/malloc.c, sysdeps/i386/nptl/tls.h * sysdeps/nacl/dl-map-segments.h, sysdeps/x86_64/atomic-machine.h * sysdeps/unix/sysv/linux/spawni.c * sysdeps/x86_64/nptl/tls.h: Include libc-pointer-arith.h instead of libc-internal.h. * elf/get-dynamic-info.h, sysdeps/nacl/dl-map-segments.h * sysdeps/x86_64/atomic-machine.h: Add multiple include guard.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/clock_settime.c | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/get_clockfreq.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/get_clockfreq.c | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/spawni.c | 2 |
6 files changed, 1 insertions, 7 deletions
diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c index 957a4b1599..e744cae6a9 100644 --- a/sysdeps/unix/clock_settime.c +++ b/sysdeps/unix/clock_settime.c @@ -18,7 +18,6 @@ #include <errno.h> #include <time.h> #include <sys/time.h> -#include <libc-internal.h> #include <ldsodefs.h> diff --git a/sysdeps/unix/sysv/linux/i386/get_clockfreq.c b/sysdeps/unix/sysv/linux/i386/get_clockfreq.c index bee3fe84e5..88e14b5f04 100644 --- a/sysdeps/unix/sysv/linux/i386/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/i386/get_clockfreq.c @@ -20,8 +20,6 @@ #include <fcntl.h> #include <string.h> #include <unistd.h> -#include <libc-internal.h> - hp_timing_t __get_clockfreq (void) diff --git a/sysdeps/unix/sysv/linux/ia64/get_clockfreq.c b/sysdeps/unix/sysv/linux/ia64/get_clockfreq.c index 5dd9c01261..603c7d516e 100644 --- a/sysdeps/unix/sysv/linux/ia64/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/ia64/get_clockfreq.c @@ -20,7 +20,6 @@ #include <fcntl.h> #include <string.h> #include <unistd.h> -#include <libc-internal.h> hp_timing_t diff --git a/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c b/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c index ad1622d601..b8d01d8ca6 100644 --- a/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c @@ -21,7 +21,6 @@ #include <stdint.h> #include <string.h> #include <unistd.h> -#include <libc-internal.h> #include <sysdep.h> #include <libc-vdso.h> #include <not-cancel.h> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c index dc9ba695bb..a0349790dc 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c @@ -24,7 +24,6 @@ #include <stdlib.h> #include <inttypes.h> #include <sys/ioctl.h> -#include <libc-internal.h> #include <asm/openpromio.h> static hp_timing_t diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index 2daf0c5ef0..24f75dbd9c 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -30,8 +30,8 @@ #include <shlib-compat.h> #include <nptl/pthreadP.h> #include <dl-sysdep.h> +#include <libc-pointer-arith.h> #include <ldsodefs.h> -#include <libc-internal.h> #include "spawn_int.h" /* The Linux implementation of posix_spawn{p} uses the clone syscall directly |