[svn] Large file fixes for Borland C, published in

[wget] / src / mswindows.h

diff --git a/src/mswindows.h b/src/mswindows.h
index 72fe8e96abe2caad70185fcaa70e8c40ea35590d..0b795af4146e1b0bd18160aef7b0b8c1f2974109 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -1,5 +1,6 @@
 /* Declarations for windows
-   Copyright (C) 1995, 1997, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1997, 1998, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -30,7 +31,38 @@ so, delete this exception statement from your version.  */
 #ifndef MSWINDOWS_H
 #define MSWINDOWS_H
 
-/* Apparently needed for alloca(). */
+#ifndef WGET_H
+#error Include mswindows.h inside or after "wget.h"
+#endif
+
+/* Prevent inclusion of <winsock*.h> in <windows.h>.  */
+#ifndef 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 Watcom/MingW.  We cannot use <winsock.h> for IPv6.  Using
+   getaddrinfo() requires <ws2tcpip.h>.  */
+#if defined(ENABLE_IPV6) || defined(HAVE_GETADDRINFO)
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <winsock.h>
+#endif
+
+#ifndef EAI_SYSTEM
+# 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.  */
+#include <io.h>
+
+/* Apparently needed for alloca().  */
 #include <malloc.h>
 
 #ifndef S_ISDIR
@@ -40,7 +72,7 @@ so, delete this exception statement from your version.  */
 # define S_ISLNK(a) 0
 #endif
 
-/* We have strcasecmp and strncasecmp, just under a different name. */
+/* We have strcasecmp and strncasecmp, just under a different name.  */
 #define strcasecmp stricmp
 #define strncasecmp strnicmp
 
@@ -48,46 +80,52 @@ so, delete this exception statement from your version.  */
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 
-/* No stat on Windows.  */
+/* Define a wgint type under Windows. */
+typedef __int64 wgint;
+#define SIZEOF_WGINT 8
+#define WGINT_MAX 9223372036854775807I64
+
+#define str_to_wgint str_to_int64
+__int64 str_to_int64 (const char *, char **, int);
+
+/* No lstat on Windows.  */
 #define lstat stat
 
-#define PATH_SEPARATOR '\\'
+/* Transparently support large files, in spirit similar to the POSIX
+   LFS API.  */
+#define stat(fname, buf) _stati64 (fname, buf)
 
-/* Microsoft says stat is _stat, Borland doesn't */
-#ifdef _MSC_VER
-# define stat _stat
+#ifndef __BORLANDC__
+# define fstat(fd, buf) _fstati64 (fd, buf)
+#endif
+
+#if defined(_MSC_VER)
+# define struct_stat struct _stati64
+#elif defined(__BORLANDC__)
+# define struct_stat struct stati64
+#else
+# define struct_stat struct stat
 #endif
 
+#define PATH_SEPARATOR '\\'
+
 #ifdef HAVE_ISATTY
-/* Microsoft VC supports _isatty; Borland ? */
 #ifdef _MSC_VER
 # define isatty _isatty
 #endif
 #endif
 
-/* Use ANSI-style stdargs regardless of whether the compiler bothers
-   to define __STDC__.  (Many don't when extensions are enabled.)  */
-#define WGET_USE_STDARG
-
-#define REALCLOSE(x) closesocket (x)
-
-/* read & write don't work with sockets on Windows 95.  */
-#define READ(fd, buf, cnt) recv ((fd), (buf), (cnt), 0)
-#define WRITE(fd, buf, cnt) send ((fd), (buf), (cnt), 0)
-
 /* #### Do we need this?  */
 #include <direct.h>
 
-/* Windows compilers accept only one arg to mkdir. */
+/* Windows compilers accept only one arg to mkdir.  */
 #ifndef __BORLANDC__
 # define mkdir(a, b) _mkdir(a)
 #else  /* __BORLANDC__ */
 # define mkdir(a, b) mkdir(a)
 #endif /* __BORLANDC__ */
 
-#include <windows.h>
-
-/* Declarations of various socket errors: */
+/* Declarations of various socket errors:  */
 
 #define EWOULDBLOCK             WSAEWOULDBLOCK
 #define EINPROGRESS             WSAEINPROGRESS
@@ -127,12 +165,27 @@ so, delete this exception statement from your version.  */
 
 /* Public functions.  */
 
+#ifndef HAVE_SLEEP
 unsigned int sleep (unsigned);
+#endif
+#ifndef HAVE_USLEEP
+int usleep (unsigned long);
+#endif
+
 void ws_startup (void);
-void ws_changetitle (char*, int);
+void ws_changetitle (const char *);
+void ws_percenttitle (double);
 char *ws_mypath (void);
-void ws_help (const char *);
 void windows_main_junk (int *, char **, char **);
-int usleep (unsigned long);
+
+/* Things needed for IPv6; missing in <ws2tcpip.h>.  */
+#ifdef ENABLE_IPV6
+# ifndef HAVE_NTOP
+  extern const char *inet_ntop (int af, const void *src, char *dst, size_t size);
+# endif
+# ifndef HAVE_PTON
+  extern int inet_pton (int af, const char *src, void *dst);
+# endif
+#endif /* ENABLE_IPV6 */
 
 #endif /* MSWINDOWS_H */