nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 11:32:48 -05:00
Code Issues Projects Releases Wiki Activity

Check for <sys/sockio.h> and include it in uxnet.c if we find it. It's

Browse Source 
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.

[originally from svn r5676]
This commit is contained in:
Ben Harris
2005-04-25 18:51:15 +00:00
parent b0d3cceb99
commit 4cb79827c6
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unix/configure.ac
View File

@ -14,6 +14,8 @@ if test "X$GCC" = Xyes; then
CFLAGS="$CFLAGS -Wall -Werror" CFLAGS="$CFLAGS -Wall -Werror"
fi fi
AC_CHECK_HEADERS([sys/sockio.h],,,[ ])
AM_PATH_GTK([1.2.0], [all_targets="all-cli all-gtk"], [all_targets="all-cli"]) AM_PATH_GTK([1.2.0], [all_targets="all-cli all-gtk"], [all_targets="all-cli"])
AC_SUBST([all_targets]) AC_SUBST([all_targets])

5
unix/uxnet.c
View File

@ -22,6 +22,11 @@
#include "network.h" #include "network.h"
#include "tree234.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 #ifndef X11_UNIX_PATH
# define X11_UNIX_PATH "/tmp/.X11-unix/X" # define X11_UNIX_PATH "/tmp/.X11-unix/X"
#endif #endif