Message ID | 20181114123643.24091-21-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:22PM +0400, Marc-André Lureau wrote: > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > slirp/slirp.h | 2 +- > slirp/slirp_config.h | 6 ------ > 2 files changed, 1 insertion(+), 7 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
Daniel P. Berrangé, le mer. 14 nov. 2018 13:51:29 +0000, a ecrit: > On Wed, Nov 14, 2018 at 04:36:22PM +0400, Marc-André Lureau wrote: > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > --- > > slirp/slirp.h | 2 +- > > slirp/slirp_config.h | 6 ------ > > 2 files changed, 1 insertion(+), 7 deletions(-) > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Applied to my tree, thanks!
diff --git a/slirp/slirp.h b/slirp/slirp.h index abe87618af..a2e7c50361 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -32,7 +32,7 @@ typedef char *caddr_t; #include <sys/socket.h> #endif -#if defined(HAVE_SYS_IOCTL_H) +#ifndef _WIN32 # include <sys/ioctl.h> #endif diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h index 68e75f3873..0e78e92d94 100644 --- a/slirp/slirp_config.h +++ b/slirp/slirp_config.h @@ -11,12 +11,6 @@ * You shouldn't need to touch any of these */ -/* Define if you have sys/ioctl.h */ -#undef HAVE_SYS_IOCTL_H -#ifndef _WIN32 -#define HAVE_SYS_IOCTL_H -#endif - /* Define if you have sys/filio.h */ #undef HAVE_SYS_FILIO_H #ifdef __APPLE__
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- slirp/slirp.h | 2 +- slirp/slirp_config.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-)