aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Watson <cjwatson@ubuntu.com>2012-09-25 12:31:16 +0100
committermaximilian attems <max@stro.at>2012-10-01 15:04:49 +0200
commit0dbcedacde2847e254373fce6f80c63e003a69ca (patch)
treeeae88e10913dbd7cccc330ea48ef5202c0fc7180
parent8152eb01350c92ad0481602d6e74aeaec0251e23 (diff)
downloadklibc-0dbcedacde2847e254373fce6f80c63e003a69ca.tar.gz
[klibc] include: [sys/time.h] fix for Linux 3.5.1
From 3.5.1, <linux/time.h> does not even define FD_ZERO etc. With Linux 3.5.1, 'make test' fails with: usr/klibc/tests/select.c: In function ‘main’: usr/klibc/tests/select.c:31:14: error: ‘FD_SETSIZE’ undeclared (first use in this function) usr/klibc/tests/select.c:31:14: note: each undeclared identifier is reported only once for each function it appears in This is due to Linux commit 8ded2bbc1845e19c771eb55209aab166ef011243. Handle it by making sure that FD_SETSIZE is defined. Signed-off-by: Colin Watson <cjwatson@ubuntu.com> Signed-off-by: maximilian attems <max@stro.at>
-rw-r--r--usr/include/sys/time.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/include/sys/time.h b/usr/include/sys/time.h
index 7a2f8b976c603..98497e707a91b 100644
--- a/usr/include/sys/time.h
+++ b/usr/include/sys/time.h
@@ -23,6 +23,7 @@
#undef FD_SET
#undef FD_CLR
#undef FD_ISSET
+#undef FD_SETSIZE
__extern void *memset(void *, int, size_t);
static inline void FD_ZERO(fd_set *__fdsetp)
@@ -45,6 +46,8 @@ static inline int FD_ISSET(int __fd, fd_set *__fdsetp)
(__fd % BITS_PER_LONG)) & 1;
}
+#define FD_SETSIZE __FD_SETSIZE
+
__extern int gettimeofday(struct timeval *, struct timezone *);
__extern int settimeofday(const struct timeval *, const struct timezone *);
__extern int getitimer(int, struct itimerval *);