Rather than checking for <sys/sockio.h>, just include it if our other

attempts at finding SIOCATMARK have failed.  This removes one of our
Autoconf tests, which is always nice.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5690 cda61777-01e9-0310-a592-d414129be87e

diff --git a/unix/configure.ac b/unix/configure.ac
index 0cbd5ce..699e6ef 100644 (file)
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -14,7 +14,6 @@ if test "X$GCC" = Xyes; then
     CFLAGS="$CFLAGS -Wall -Werror"
 fi
 
-AC_CHECK_HEADERS([sys/sockio.h],,,[ ])
 AC_CHECK_HEADERS([utmpx.h],,,[
 #include <sys/types.h>
 #include <utmp.h>])

diff --git a/unix/uxnet.c b/unix/uxnet.c
index 5d4ace4..a43adcb 100644 (file)
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -23,7 +23,7 @@
 #include "tree234.h"
 
 /* Solaris needs <sys/sockio.h> for SIOCATMARK. */
-#ifdef HAVE_SYS_SOCKIO_H
+#ifndef SOCKATMARK
 #include <sys/sockio.h>
 #endif