From: Danny Mayer <mayer@ntp.org>
Date: Sun, 21 May 2006 16:10:13 +0000 (-0400)
Subject: Bug #614 Changed dup_fd to move_fd and remove for Windows
X-Git-Tag: NTP_4_2_1P254_RC~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd348065b9b11a8a5acbe6cfa64932ae40790da;p=thirdparty%2Fntp.git

Bug #614 Changed dup_fd to move_fd and remove for Windows

bk: 447090e5HDtb_g-zr3bAsC5AeeLwxA
---

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index cd571f242..72c57f663 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -149,8 +149,8 @@ static	void	close_socket	P((SOCKET));
 #ifdef REFCLOCK
 static	void	close_file	P((SOCKET));
 #endif
-#ifdef F_DUPFD
-static int	dup_fd		P((int));
+#if !defined(SYS_WINNT) && defined(F_DUPFD)
+static int	move_fd		P((int));
 #ifndef FOPEN_MAX
 #define FOPEN_MAX	20
 #endif
@@ -248,8 +248,8 @@ connection_reset_fix(SOCKET fd) {
 }
 #endif
 
-#ifdef F_DUPFD
-static int dup_fd(int fd)
+#if !defined(SYS_WINNT) && defined(F_DUPFD)
+static int move_fd(int fd)
 {
 	int tmp, newfd;
         /*
@@ -1515,7 +1515,7 @@ open_socket(
 	 * Fixup the file descriptor for some systems
 	 * See bug #530 for details of the issue.
 	 */
-	fd = dup_fd(fd);
+	fd = move_fd(fd);
 #endif
 
 	/*