Merge with mainline

[wget] / src / connect.c

diff --git a/src/connect.c b/src/connect.c
index 11d6e193faa69fa3603bbf885404e22efdad9f0a..5e7ccee671ecc4cec86211189ac90c904618d8b5 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -1,5 +1,6 @@
 /* Establishing and handling network connections.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -668,7 +669,7 @@ test_socket_open (int sock)
 \f
 /* Basic socket operations, mostly EINTR wrappers.  */
 
-#ifdef WINDOWS
+#if defined(WINDOWS) || defined(MSDOS)
 # define read(fd, buf, cnt) recv (fd, buf, cnt, 0)
 # define write(fd, buf, cnt) send (fd, buf, cnt, 0)
 # define close(fd) closesocket (fd)