From: ben <ben@cda61777-01e9-0310-a592-d414129be87e>
Date: Mon, 25 Apr 2005 18:51:15 +0000 (+0000)
Subject: Check for <sys/sockio.h> and include it in uxnet.c if we find it.  It's
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/dbf58cfaacdf65821233c608b834bd46a65d5467

Check for <sys/sockio.h> and include it in uxnet.c if we find it.  It's
necessary on Solaris if we want to use SIOCATMARK.  Using sockatmark() might
be preferable, but despite being notionally standard it's missing on
Solaris 9 and Mac OS X 10.3.9, whereas everyone seems to have SIOCATMARK
somewhere.


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

diff --git a/unix/configure.ac b/unix/configure.ac
index 91563562..e1e33acb 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -14,6 +14,8 @@ if test "X$GCC" = Xyes; then
     CFLAGS="$CFLAGS -Wall -Werror"
 fi
 
+AC_CHECK_HEADERS([sys/sockio.h],,,[ ])
+
 AM_PATH_GTK([1.2.0], [all_targets="all-cli all-gtk"], [all_targets="all-cli"])
 AC_SUBST([all_targets])
 
diff --git a/unix/uxnet.c b/unix/uxnet.c
index 31b12921..5d4ace44 100644
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -22,6 +22,11 @@
 #include "network.h"
 #include "tree234.h"
 
+/* Solaris needs <sys/sockio.h> for SIOCATMARK. */
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
 #ifndef X11_UNIX_PATH
 # define X11_UNIX_PATH "/tmp/.X11-unix/X"
 #endif