[svn] Update FSF's address and copyright years.

[wget] / src / mswindows.h

diff --git a/src/mswindows.h b/src/mswindows.h
index ef4f4fab7eb6a2b34426ce8a011eac9a0f97cfba..877bbff3c07ee33a593c0ab6b6d7bcac639e358f 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -1,6 +1,5 @@
 /* Declarations for windows
-   Copyright (C) 1995, 1997, 1997, 1998, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1996-2005 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -15,8 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+along with Wget; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -32,20 +31,20 @@ so, delete this exception statement from your version.  */
 #define MSWINDOWS_H
 
 #ifndef WGET_H
-#error Include mswindows.h inside or after "wget.h"
+# error This file should not be included directly.
 #endif
 
 /* Prevent inclusion of <winsock*.h> in <windows.h>.  */
 #ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
 #endif
 
 #include <windows.h>
 
-/* Use the correct winsock header; <ws2tcpip.h> includes <winsock2.h>
-   only on MingW.  We cannot use <winsock.h> for IPv6.  Using
-   getaddrinfo() requires <ws2tcpip.h>.  */
-#if defined(ENABLE_IPV6) || defined(HAVE_GETADDRINFO)
+/* We need winsock2.h for IPv6 and ws2tcpip.h for getaddrinfo, so
+  include both in ENABLE_IPV6 case.  (ws2tcpip.h includes winsock2.h
+  only on MinGW.) */
+#ifdef ENABLE_IPV6
 # include <winsock2.h>
 # include <ws2tcpip.h>
 #else
@@ -56,15 +55,10 @@ so, delete this exception statement from your version.  */
 # define EAI_SYSTEM -1   /* value doesn't matter */
 #endif
 
-/* Must include <sys/stat.h> because of 'stat' define below.  */
-#include <sys/stat.h>
-
-/* Missing in several .c files.  Include here.  */
+/* Declares file access functions, such as open, creat, access, and
+   chmod.  Unix declares these in unistd.h and fcntl.h.  */
 #include <io.h>
 
-/* Apparently needed for alloca().  */
-#include <malloc.h>
-
 #ifndef S_ISDIR
 # define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))
 #endif
@@ -134,16 +128,23 @@ __int64 str_to_int64 (const char *, char **, int);
 #endif
 #endif
 
-/* #### Do we need this?  */
-#include <direct.h>
-
-/* Windows compilers accept only one arg to mkdir.  */
+/* Win32 doesn't support the MODE argument to mkdir.  */
 #define mkdir(a, b) _mkdir(a)
 
+/* Additional declarations needed for IPv6: */
+#ifdef ENABLE_IPV6
+const char *inet_ntop (int, const void *, char *, socklen_t);
+/* MinGW 3.7 (or older) prototypes gai_strerror(), but is missing
+   from all import libraries. */
+# ifdef __MINGW32__
+#  undef gai_strerror
+#  define gai_strerror windows_strerror
+# endif
+#endif /* ENABLE_IPV6 */
+
 #ifndef INHIBIT_WRAP
 
-/* Winsock functions don't set errno, so we provide wrappers
-   that do. */
+/* Winsock functions don't set errno, so we provide wrappers that do. */
 
 #define socket wrapped_socket
 #define bind wrapped_bind
@@ -222,11 +223,4 @@ void ws_percenttitle (double);
 char *ws_mypath (void);
 void windows_main (int *, char **, char **);
 
-/* Things needed for IPv6; missing in <ws2tcpip.h>.  */
-#ifdef ENABLE_IPV6
-# ifndef HAVE_INET_NTOP
-extern const char *inet_ntop (int af, const void *src, char *dst, size_t size);
-# endif
-#endif /* ENABLE_IPV6 */
-
 #endif /* MSWINDOWS_H */