diff options
author | Rich Felker <dalias@aerifal.cx> | 2018-09-12 00:08:09 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2018-09-12 14:34:37 -0400 |
commit | 5ce3737931bb411a8d167356d4d0287b53b0cbdc (patch) | |
tree | 726fc5dde9cc462316faa715158c38f0da72292d /src/mman | |
parent | 0676c3a34c7bf12b33f8f5efb92476f4ffc7f20e (diff) | |
download | musl-5ce3737931bb411a8d167356d4d0287b53b0cbdc.tar.gz |
reduce spurious inclusion of libc.h
libc.h was intended to be a header for access to global libc state and
related interfaces, but ended up included all over the place because
it was the way to get the weak_alias macro. most of the inclusions
removed here are places where weak_alias was needed. a few were
recently introduced for hidden. some go all the way back to when
libc.h defined CANCELPT_BEGIN and _END, and all (wrongly implemented)
cancellation points had to include it.
remaining spurious users are mostly callers of the LOCK/UNLOCK macros
and files that use the LFS64 macro to define the awful *64 aliases.
in a few places, new inclusion of libc.h is added because several
internal headers no longer implicitly include libc.h.
declarations for __lockfile and __unlockfile are moved from libc.h to
stdio_impl.h so that the latter does not need libc.h. putting them in
libc.h made no sense at all, since the macros in stdio_impl.h are
needed to use them correctly anyway.
Diffstat (limited to 'src/mman')
-rw-r--r-- | src/mman/madvise.c | 1 | ||||
-rw-r--r-- | src/mman/mremap.c | 1 | ||||
-rw-r--r-- | src/mman/munmap.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/mman/madvise.c b/src/mman/madvise.c index f80926be..e0c7c0ec 100644 --- a/src/mman/madvise.c +++ b/src/mman/madvise.c @@ -1,6 +1,5 @@ #include <sys/mman.h> #include "syscall.h" -#include "libc.h" int __madvise(void *addr, size_t len, int advice) { diff --git a/src/mman/mremap.c b/src/mman/mremap.c index ce4e8ea1..cc6991a6 100644 --- a/src/mman/mremap.c +++ b/src/mman/mremap.c @@ -5,7 +5,6 @@ #include <stdint.h> #include <stdarg.h> #include "syscall.h" -#include "libc.h" static void dummy(void) { } weak_alias(dummy, __vm_wait); diff --git a/src/mman/munmap.c b/src/mman/munmap.c index 3f711ee5..2bf83bbe 100644 --- a/src/mman/munmap.c +++ b/src/mman/munmap.c @@ -1,6 +1,5 @@ #include <sys/mman.h> #include "syscall.h" -#include "libc.h" static void dummy(void) { } weak_alias(dummy, __vm_wait); |