summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@strace.io>2021-01-05 08:00:00 +0000
committerDmitry V. Levin <ldv@strace.io>2021-01-05 08:00:00 +0000
commit40e69eb766fda9a27ad8e394304fdeb3527b2e0c (patch)
tree502d6022bbc8899037437b07760cf60fd3c1f6da
parentbc4d15eee9dcfd54f1a5722c35f16fb67d0d59be (diff)
downloadstrace-40e69eb766fda9a27ad8e394304fdeb3527b2e0c.tar.gz
sock: remove redundant ifdefs
* sock.c: Include <linux/ioctl.h> unconditionally. (sock_ioctl): Handle SIOCBRADDBR, SIOCBRDELBR, FIOSETOWN, FIOGETOWN, SIOCSPGRP, SIOCGPGRP, SIOCATMARK, SIOCBRADDIF, and SIOCBRDELIF unconditionally.
-rw-r--r--sock.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/sock.c b/sock.c
index e9f97d778..9bf0e4cf9 100644
--- a/sock.c
+++ b/sock.c
@@ -10,9 +10,7 @@
#include "print_fields.h"
#include <sys/socket.h>
-#if defined ALPHA || defined SH || defined SH64
-# include <linux/ioctl.h>
-#endif
+#include <linux/ioctl.h>
#include <linux/sockios.h>
#include <arpa/inet.h>
#include <net/if.h>
@@ -219,45 +217,29 @@ MPERS_PRINTER_DECL(int, sock_ioctl,
case SIOCGIFCONF:
return decode_ifconf(tcp, arg);
-#ifdef SIOCBRADDBR
case SIOCBRADDBR:
case SIOCBRDELBR:
tprints(", ");
printstr(tcp, arg);
break;
-#endif
-#ifdef FIOSETOWN
case FIOSETOWN:
-#endif
-#ifdef SIOCSPGRP
case SIOCSPGRP:
-#endif
tprints(", ");
printnum_int(tcp, arg, "%d");
break;
-#ifdef FIOGETOWN
case FIOGETOWN:
-#endif
-#ifdef SIOCGPGRP
case SIOCGPGRP:
-#endif
-#ifdef SIOCATMARK
case SIOCATMARK:
-#endif
if (entering(tcp))
return 0;
tprints(", ");
printnum_int(tcp, arg, "%d");
break;
-#ifdef SIOCBRADDIF
case SIOCBRADDIF:
-#endif
-#ifdef SIOCBRDELIF
case SIOCBRDELIF:
-#endif
/* no arguments */
break;