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 f7a5c5fc9119e1d953534de248542738d908bb1e..3efb0fce2fbcff71efb89ba1b48532619f22396b 100644 (file)
--- 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 ca323e6b9aa57c3251e854f5e98bf04b2c84d82a..a3cb7ce2e1751dddedaf7e28ba63d4a8cf4d36c7 100644 (file)
--- 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