Merged in a bunch of patches that I got as reaction to the 3.99 release.

See the ChangeLog for details

1 files changed, 4 insertions, 0 deletions

diff --git a/sock.c b/sock.c
index dc03190..327a3de 100644
--- 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)