From: hjl <hjl>
Date: Fri, 13 Sep 2002 03:50:43 +0000 (+0000)
Subject: 2002-09-12  H.J. Lu <hjl@lucon.org>
X-Git-Tag: nfs-utils-1-0-2-pre4~11
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=253a4182bcdb46a4da412513ba5880e352a8fa93;hp=475135e4bb90212385f19c8aac8b39bd123f0a2f

2002-09-12  H.J. Lu <hjl@lucon.org>

	* support/nfs/svc_socket.c: Remove HAVE_SVCTCP_SOCKET and
	HAVE_SVCUDP_SOCKET.
---

diff --git a/ChangeLog b/ChangeLog
index f7a5c5f..3efb0fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-12  H.J. Lu <hjl@lucon.org>
+
+	* support/nfs/svc_socket.c: Remove HAVE_SVCTCP_SOCKET and
+	HAVE_SVCUDP_SOCKET.
+
 2002-09-12  H.J. Lu <hjl@lucon.org>
 
 	* configure.in: Remove checking svctcp_socket and svcudp_socket.
diff --git a/support/nfs/svc_socket.c b/support/nfs/svc_socket.c
index ca323e6..a3cb7ce 100644
--- a/support/nfs/svc_socket.c
+++ b/support/nfs/svc_socket.c
@@ -27,7 +27,6 @@
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "config.h"
 # ifndef _
 #  define _(s)			(s)
 # endif
@@ -35,7 +34,6 @@
 # define __close(f)		close ((f))
 #endif
 
-#if !defined HAVE_SVCTCP_SOCKET || !defined HAVE_SVCUDP_SOCKET
 static int
 svc_socket (u_long number, int type, int protocol, int reuse)
 {
@@ -116,9 +114,7 @@ svc_socket (u_long number, int type, int protocol, int reuse)
 
   return sock;
 }
-#endif
 
-#ifndef HAVE_SVCTCP_SOCKET
 /*
  * Create and bind a TCP socket based on program number
  */
@@ -127,9 +123,7 @@ svctcp_socket (u_long number, int reuse)
 {
   return svc_socket (number, SOCK_STREAM, IPPROTO_TCP, reuse);
 }
-#endif
 
-#ifndef HAVE_SVCUDP_SOCKET
 /*
  * Create and bind a UDP socket based on program number
  */
@@ -138,7 +132,6 @@ svcudp_socket (u_long number, int reuse)
 {
   return svc_socket (number, SOCK_DGRAM, IPPROTO_UDP, reuse);
 }
-#endif
 
 #ifdef TEST
 static int