| Message ID | 20181114123643.24091-20-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | RFC: slirp: make it again a standalone project | expand |
On Wed, Nov 14, 2018 at 04:36:21PM +0400, Marc-André Lureau wrote: > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > slirp/main.h | 4 ---- > slirp/slirp.h | 4 ---- > slirp/slirp_config.h | 6 ------ > 3 files changed, 14 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
Daniel P. Berrangé, le mer. 14 nov. 2018 13:51:01 +0000, a ecrit: > On Wed, Nov 14, 2018 at 04:36:21PM +0400, Marc-André Lureau wrote: > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > --- > > slirp/main.h | 4 ---- > > slirp/slirp.h | 4 ---- > > slirp/slirp_config.h | 6 ------ > > 3 files changed, 14 deletions(-) > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Applied to my tree, thanks!
diff --git a/slirp/main.h b/slirp/main.h index e04677944f..4bc05fb904 100644 --- a/slirp/main.h +++ b/slirp/main.h @@ -8,10 +8,6 @@ #ifndef SLIRP_MAIN_H #define SLIRP_MAIN_H -#ifdef HAVE_SYS_SELECT_H -#include <sys/select.h> -#endif - extern u_int curtime; extern struct in_addr loopback_addr; extern unsigned long loopback_mask; diff --git a/slirp/slirp.h b/slirp/slirp.h index 7aa14feeb6..abe87618af 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -36,10 +36,6 @@ typedef char *caddr_t; # include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_SELECT_H -# include <sys/select.h> -#endif - #ifdef HAVE_SYS_FILIO_H # include <sys/filio.h> #endif diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h index 9becb98e11..68e75f3873 100644 --- a/slirp/slirp_config.h +++ b/slirp/slirp_config.h @@ -32,12 +32,6 @@ #define DECLARE_IOVEC #endif -/* Define if you have sys/select.h */ -#undef HAVE_SYS_SELECT_H -#ifndef _WIN32 -#define HAVE_SYS_SELECT_H -#endif - /* Define to sizeof(char *) */ #define SIZEOF_CHAR_P (HOST_LONG_BITS / 8)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- slirp/main.h | 4 ---- slirp/slirp.h | 4 ---- slirp/slirp_config.h | 6 ------ 3 files changed, 14 deletions(-)