This patch should address the problems you've seen:
Index: src/mswindows.h
===================================================================
--- src/mswindows.h (revision 2008)
+++ src/mswindows.h (working copy)
@@ -98,6 +98,14 @@
is equivalent to stat anyway. */
#define lstat stat
+/* Define LFS aliases for stat and fstat. */
+#ifdef stat_alias
+# define stat(f, b) stat_alias (f, b)
+#endif
+#ifdef fstat_alias
+# define fstat(f, b) fstat_alias (f, b)
+#endif
+
#define PATH_SEPARATOR '\\'
/* Win32 doesn't support the MODE argument to mkdir. */
@@ -109,6 +117,11 @@
const char *inet_ntop (int, const void *, char *, socklen_t);
#endif
+#ifdef NEED_GAI_STRERROR
+# undef gai_strerror
+# define gai_strerror windows_strerror
+#endif
+
#ifndef INHIBIT_WRAP
/* Winsock functions don't set errno, so we provide wrappers that do. */
Index: src/ChangeLog
===================================================================
--- src/ChangeLog (revision 2008)
+++ src/ChangeLog (working copy)
@@ -1,3 +1,10 @@
+2005-07-07 Hrvoje Niksic <[EMAIL PROTECTED]>
+
+ * mswindows.h: Define an alias for stat and fstat, as requested by
+ config-compiler.h.
+ (gai_strerror): Define to windows_strerror if NEED_GAI_STRERROR is
+ defined.
+
2005-07-06 Hrvoje Niksic <[EMAIL PROTECTED]>
* mswindows.h: Use strtoll where available.
Index: windows/config-compiler.h
===================================================================
--- windows/config-compiler.h (revision 2011)
+++ windows/config-compiler.h (working copy)
@@ -45,10 +45,6 @@
contains most of the explanatory comments. Things that apply to
*all* compilers, as well as things that are specific to Wget,
belong in src/mswindows.h. */
-
-/* For all compilers: must include <sys/stat.h> *before* redefining
- stat. */
-#include <sys/stat.h>
/* -------------------- */
/* MinGW (GCC) section. */
@@ -60,10 +56,11 @@
#define LL(n) n##LL
/* Transparently support statting large files, like POSIX's LFS API
- does. All Windows compilers we support use _stati64 (but have
- different names for 2nd argument type, see below), so we use
- that. */
-#define stat(fname, buf) _stati64 (fname, buf)
+ does, by aliasing stat and fstat to their equivalents that do LFS.
+ Most Windows compilers we support use _stati64 (but have different
+ names for 2nd argument type, see below), so we use that. */
+#define stat_alias _stati64
+#define fstat_alias _fstati64
/* On Windows the 64-bit stat requires an explicitly different type
for the 2nd argument, so we define a struct_stat macro that expands
@@ -81,13 +78,16 @@
/* MinGW 3.7 (or older) prototypes gai_strerror(), but is missing
from all import libraries. */
#ifdef ENABLE_IPV6
-# undef gai_strerror
-# define gai_strerror windows_strerror
+# define NEED_GAI_STRERROR
#endif
/* MinGW and GCC support some POSIX and C99 features. */
+#define HAVE_INTTYPES_H 1
+
#define HAVE__BOOL 1
-#define HAVE_INTTYPES_H 1
+#undef SIZEOF_LONG_LONG /* avoid redefinition warning */
+#define SIZEOF_LONG_LONG 8
+
#define HAVE_STRTOLL 1
/* -------------------- */
@@ -99,7 +99,8 @@
#define LL(n) n##I64
-#define stat(fname, buf) _stati64 (fname, buf)
+#define stat_alias _stati64
+#define fstat_alias _fstati64
#define struct_stat struct _stati64
#define struct_fstat struct _stati64
@@ -117,9 +118,11 @@
#define OS_TYPE "Windows-Borland"
#define LL(n) n##I64
-#define stat(fname, buf) _stati64 (fname, buf)
+
+#define stat_alias _stati64
+#undef fstat_alias
#define struct_stat struct stati64
-#define struct_fstat struct stat
+#undef struct_fstat
/* ------------------------------ */
/* Digital Mars Compiler section. */
@@ -132,7 +135,8 @@
/* DMC supports 64-bit types, including long long, but not statting
large files. */
-#undef stat
+#undef stat_alias
+#undef fstat_alias
/* If left undefined, sysdep.h will define these to struct stat. */
#undef struct_stat
#undef struct_fstat
Index: windows/ChangeLog
===================================================================
--- windows/ChangeLog (revision 2011)
+++ windows/ChangeLog (working copy)
@@ -1,3 +1,10 @@
+2005-07-07 Hrvoje Niksic <[EMAIL PROTECTED]>
+
+ * config-compiler.h (stat_alias): Don't directly redefine stat and
+ fstat here. Just define the alias symbols.
+ (gai_strerror): Just declare that it needs to be defined instead
+ of defining it directly.
+
2005-07-07 Gisle Vanem <[EMAIL PROTECTED]>
* config-compiler.h: Define HAVE__BOOL, HAVE_INTTYPES_H, and
