From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 13 May 2016 20:22:18 +0000 (+0000)
Subject: sock.c: include <linux/ioctl.h> instead of <sys/ioctl.h> or <ioctls.h>
X-Git-Tag: v4.12~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=deff569f4122fe80f7afe7b2bdb232db6105a848;p=strace

sock.c: include <linux/ioctl.h> instead of <sys/ioctl.h> or <ioctls.h>

Include <linux/ioctl.h> for <linux/sockios.h> on alpha, sh, and sh64
architectures because their <asm/sockios.h> use _IOR and _IOW macros
but don't include anything that would define these macros.

Being a wrapper around <linux/ioctl.h>, <sys/ioctl.h> brings
no benefits in this case.  <ioctls.h> simply doesn't exist.

* sock.c [ALPHA || SH || SH64]: Include <linux/ioctl.h>
instead of <sys/ioctl.h> or <ioctls.h>.
---

diff --git a/sock.c b/sock.c
index 4da53022..88a0df53 100644
--- a/sock.c
+++ b/sock.c
@@ -27,15 +27,11 @@
 
 #include "defs.h"
 #include <sys/socket.h>
+#if defined ALPHA || defined SH || defined SH64
+# include <linux/ioctl.h>
+#endif
 #include <linux/sockios.h>
 #include <arpa/inet.h>
-#if defined(ALPHA) || defined(SH) || defined(SH64)
-# if defined(HAVE_SYS_IOCTL_H)
-#  include <sys/ioctl.h>
-# elif defined(HAVE_IOCTLS_H)
-#  include <ioctls.h>
-# endif
-#endif
 #include <net/if.h>
 
 #include "xlat/iffflags.h"