From 8f5e5726134ce5b4bd436b16f367796d851df553 Mon Sep 17 00:00:00 2001
From: Manoj Srivastava <srivasta@golden-gryphon.com>
Date: Sun, 27 Apr 2014 17:54:01 -0700
Subject: Imported Upstream version 3.5-36

---
 mcon/U/d_socket.U | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'mcon/U/d_socket.U')

diff --git a/mcon/U/d_socket.U b/mcon/U/d_socket.U
index 234f9e3..161303e 100644
--- a/mcon/U/d_socket.U
+++ b/mcon/U/d_socket.U
@@ -1,11 +1,11 @@
-?RCS: $Id: d_socket.U 1 2006-08-24 12:32:52Z rmanfredi $
+?RCS: $Id: d_socket.U 167 2013-05-08 17:58:00Z rmanfredi $
 ?RCS:
 ?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 ?RCS: 
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: You may redistribute only under the terms of the Artistic License,
 ?RCS: as specified in the README file that comes with the distribution.
 ?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
 ?RCS: of the source tree for dist 4.0.
 ?RCS:
 ?RCS: $Log: d_socket.U,v $
@@ -19,7 +19,7 @@
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
 ?MAKE:d_socket d_oldsock d_sockpair socketlib sockethdr: contains libc \
-	echo n c nm_opt nm_extract Inlibc Csym _a
+	echo n c nm_opt nm_extract Trylink Csym _a cat i_syssock i_winsock2
 ?MAKE:	-pick add $@ %<
 ?S:d_socket:
 ?S:	This variable conditionally defines HAS_SOCKET, which indicates
@@ -39,15 +39,15 @@
 ?S:sockethdr:
 ?S:	This variable has any cpp -I flags needed for socket support.
 ?S:.
-?C:HAS_SOCKET (SOCKET):
+?C:HAS_SOCKET:
 ?C:	This symbol, if defined, indicates that the BSD socket interface is
 ?C:	supported.
 ?C:.
-?C:HAS_SOCKETPAIR (SOCKETPAIR):
+?C:HAS_SOCKETPAIR:
 ?C:	This symbol, if defined, indicates that the BSD socketpair() call is
 ?C:	supported.
 ?C:.
-?C:USE_OLDSOCKET (OLDSOCKET):
+?C:USE_OLDSOCKET:
 ?C:	This symbol, if defined, indicates that the 4.1c BSD socket interface
 ?C:	is supported instead of the 4.2/4.3 BSD socket interface. For instance,
 ?C:	there is no setsockopt() call.
@@ -117,7 +117,24 @@ fi
 
 @if HAS_SOCKETPAIR || d_sockpair
 : see if socketpair exists
-set socketpair d_sockpair
-eval $inlibc
+$cat >try.c <<EOC
+#$i_syssock I_SYS_SOCKET
+#$i_winsock2 I_WINSOCK2
+#ifdef I_SYS_SOCKET
+#include <sys/socket.h>
+#endif
+#ifdef I_WINSOCK2
+#include <Winsock2.h>
+#endif
+int main(void)
+{
+	static int ret, domain, type, protocol, sv[2];
+	ret |= socketpair(domain, type, protocol, sv);
+	return ret ? 0 : 1;
+}
+EOC
+cyn=socketpair
+set d_sockpair
+eval $trylink
 
 @end
-- 
cgit v1.2.3