Merge Harald Böhme's solaris patches

[strace] / sock.c

diff --git a/sock.c b/sock.c
index dc03190560765e7d34f7eef919f8baff0a06d55a..327a3de859e12f78a8885d6549219fab381729a9 100644 (file)
--- a/sock.c
+++ b/sock.c
@@ -36,8 +36,12 @@
 #endif
 
 #ifdef ALPHA
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#elif defined(HAVE_IOCTLS_H)
 #include <ioctls.h>
 #endif
+#endif
 
 int
 sock_ioctl(tcp, code, arg)