This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
[glibc/zack/no-nested-includes] fixup probably for Don't include sys/select.h from sys/types.h
- From: Zack Weinberg <zack at sourceware dot org>
- To: glibc-cvs at sourceware dot org
- Date: 26 May 2019 16:37:28 -0000
- Subject: [glibc/zack/no-nested-includes] fixup probably for Don't include sys/select.h from sys/types.h
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3c2904e1b4ed93cf04789b7a1d78408fa9137f4a
commit 3c2904e1b4ed93cf04789b7a1d78408fa9137f4a
Author: Zack Weinberg <zackw@panix.com>
Date: Sun May 26 11:07:20 2019 -0400
fixup probably for Don't include sys/select.h from sys/types.h
Not including sys/select.h from sys/types.h means that sys/types.h
also no longer defines anything from sys/time.h, and a couple of
files were relying on that.
(pthread_join_common.c should be using clock_gettime instead of
gettimeofday, but that's out of scope for this patch series.)
* nptl/pthread_join_common.c, sysdeps/unix/sysv/linux/dl-vdso.h:
Include sys/time.h.
Diff:
---
nptl/pthread_join_common.c | 2 ++
sysdeps/unix/sysv/linux/dl-vdso.h | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/nptl/pthread_join_common.c b/nptl/pthread_join_common.c
index 5224ee2..b8b016c 100644
--- a/nptl/pthread_join_common.c
+++ b/nptl/pthread_join_common.c
@@ -20,6 +20,8 @@
#include <atomic.h>
#include <stap-probe.h>
+#include <sys/time.h>
+
static void
cleanup (void *arg)
{
diff --git a/sysdeps/unix/sysv/linux/dl-vdso.h b/sysdeps/unix/sysv/linux/dl-vdso.h
index 50ee290..c0109ba 100644
--- a/sysdeps/unix/sysv/linux/dl-vdso.h
+++ b/sysdeps/unix/sysv/linux/dl-vdso.h
@@ -23,6 +23,12 @@
#include <ldsodefs.h>
#include <dl-hash.h>
+/* This header must declare all functions that might be looked up
+ in the vDSO by code fragments generated by make-syscalls.sh.
+ At present the only such function that isn't covered by the above
+ headers is gettimeofday. */
+#include <sys/time.h>
+
/* Create version number record for lookup. */
#define PREPARE_VERSION(var, vname, vhash) \
struct r_found_version var; \