diff options
author | Matthew Fioravante <matthew.fioravante@jhuapl.edu> | 2012-10-09 10:39:09 +0100 |
---|---|---|
committer | Matthew Fioravante <matthew.fioravante@jhuapl.edu> | 2012-10-09 10:39:09 +0100 |
commit | 5c2852a2a5b1a138b79672dae6e2264f26d6b1d9 (patch) | |
tree | 6cc4b762b782c38712db3c0834720c3060e005e7 | |
parent | 78ef2bb502c15bd7ef117a365e6afc7dee4ad71b (diff) | |
download | xen-5c2852a2a5b1a138b79672dae6e2264f26d6b1d9.tar.gz xen-5c2852a2a5b1a138b79672dae6e2264f26d6b1d9.tar.bz2 xen-5c2852a2a5b1a138b79672dae6e2264f26d6b1d9.zip |
minios: add select definition to sys/time.h when HAVE_LIBC is defined
This patch adds the select function to sys/time.h when HAVE_LIBC is
defined, which is according to standard (see the select() manpage).
It also removes a redudant lwip include from posix/sys/select.h.
Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
-rw-r--r-- | extras/mini-os/include/posix/sys/select.h | 1 | ||||
-rw-r--r-- | extras/mini-os/include/sys/time.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/extras/mini-os/include/posix/sys/select.h b/extras/mini-os/include/posix/sys/select.h index a9337be4fc..5132c51224 100644 --- a/extras/mini-os/include/posix/sys/select.h +++ b/extras/mini-os/include/posix/sys/select.h @@ -2,7 +2,6 @@ #define _POSIX_SELECT_H #include <sys/time.h> -#include <lwip/sockets.h> int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); #endif /* _POSIX_SELECT_H */ diff --git a/extras/mini-os/include/sys/time.h b/extras/mini-os/include/sys/time.h index d6623a4e77..3be3653c4f 100644 --- a/extras/mini-os/include/sys/time.h +++ b/extras/mini-os/include/sys/time.h @@ -22,6 +22,7 @@ #ifdef HAVE_LIBC #include_next <sys/time.h> + #else struct timespec { time_t tv_sec; @@ -37,6 +38,10 @@ struct timeval { }; int gettimeofday(struct timeval *tv, void *tz); + +#endif +#ifdef HAVE_LIBC +#include <sys/select.h> #endif #endif /* _MINIOS_SYS_TIME_H_ */ |