From 5ce3737931bb411a8d167356d4d0287b53b0cbdc Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 12 Sep 2018 00:08:09 -0400 Subject: 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. --- src/select/poll.c | 1 - src/select/pselect.c | 1 - src/select/select.c | 1 - 3 files changed, 3 deletions(-) (limited to 'src/select') diff --git a/src/select/poll.c b/src/select/poll.c index 9e0bcbd8..c84c8a99 100644 --- a/src/select/poll.c +++ b/src/select/poll.c @@ -2,7 +2,6 @@ #include #include #include "syscall.h" -#include "libc.h" int poll(struct pollfd *fds, nfds_t n, int timeout) { diff --git a/src/select/pselect.c b/src/select/pselect.c index 4e2d7b07..762af37f 100644 --- a/src/select/pselect.c +++ b/src/select/pselect.c @@ -2,7 +2,6 @@ #include #include #include "syscall.h" -#include "libc.h" int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask) { diff --git a/src/select/select.c b/src/select/select.c index 7b5f6dcf..02fd75c3 100644 --- a/src/select/select.c +++ b/src/select/select.c @@ -3,7 +3,6 @@ #include #include #include "syscall.h" -#include "libc.h" int select(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, struct timeval *restrict tv) { -- cgit v1.2.1