From 62cdb81e0a92f7fae3c7da4f60c14d9a5339904e Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Wed, 27 Apr 2005 15:42:10 +0000
Subject: [PATCH] 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.

[originally from svn r5690]
---
 unix/configure.ac | 1 -
 unix/uxnet.c      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/unix/configure.ac b/unix/configure.ac
index 0cbd5cee..699e6ef8 100644
--- 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 5d4ace44..a43adcb1 100644
--- 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