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 /locale | |
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 'locale')
-rw-r--r-- | locale/programs/locarchive.c | 2 | ||||
-rw-r--r-- | locale/weight.h | 2 | ||||
-rw-r--r-- | locale/weightwc.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index 13c4e9ee42..f67b7b8d99 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -40,8 +40,8 @@ #include <sys/shm.h> #include <sys/stat.h> -#include <libc-internal.h> #include <libc-mmap.h> +#include <libc-pointer-arith.h> #include "../../crypt/md5.h" #include "../localeinfo.h" #include "../locarchive.h" diff --git a/locale/weight.h b/locale/weight.h index f4797180d1..0558123f34 100644 --- a/locale/weight.h +++ b/locale/weight.h @@ -19,7 +19,7 @@ #ifndef _WEIGHT_H_ #define _WEIGHT_H_ 1 -#include <libc-internal.h> +#include <libc-diag.h> /* Find index of weight. */ static inline int32_t __attribute__ ((always_inline)) diff --git a/locale/weightwc.h b/locale/weightwc.h index 6a726aa86b..97ce2b3dec 100644 --- a/locale/weightwc.h +++ b/locale/weightwc.h @@ -19,7 +19,7 @@ #ifndef _WEIGHTWC_H_ #define _WEIGHTWC_H_ 1 -#include <libc-internal.h> +#include <libc-diag.h> /* Find index of weight. */ static inline int32_t __attribute__ ((always_inline)) |