[svn] Several Windows-related changes.

[wget] / windows / config-compiler.h

diff --git a/windows/config-compiler.h b/windows/config-compiler.h
index 6c5268918a971c2c2268f125bd27c5263323b839..033f470dd5b830ddf20bbee68e5dc2d0aa810260 100644 (file)
--- a/windows/config-compiler.h
+++ b/windows/config-compiler.h
@@ -87,8 +87,18 @@ so, delete this exception statement from your version.  */
 #define HAVE__BOOL 1
 #undef SIZEOF_LONG_LONG                /* avoid redefinition warning */
 #define SIZEOF_LONG_LONG 8
-
+#define HAVE_INTPTR_T 1 
+#define HAVE_UINTPTR_T 1
 #define HAVE_STRTOLL 1
+\f
+/* MingW needs _WIN32_WINNT==0x0501 defined to pull in getaddrinfo()
+ * and freeaddrinfo() etc.
+ */
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501)
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+
 \f
 /* -------------------- */
 /* MS Visual C section. */
@@ -109,6 +119,14 @@ so, delete this exception statement from your version.  */
 #if _MSC_VER >= 1300
 # define HAVE__STRTOI64 1
 #endif
+
+#if _MSC_VER >= 1400
+#pragma warning ( disable : 4996 )
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+\f
+#undef HAVE_UTIME_H         /* no <utime.h> */
+
 \f
 /* ------------------ */
 /* Borland C section. */
@@ -149,12 +167,56 @@ so, delete this exception statement from your version.  */
 #define HAVE_STDBOOL_H 1
 
 #define HAVE_UINT32_T 1
-#undef SIZEOF_LONG_LONG                /* avoid redefinition warning */
+#define HAVE_UINTPTR_T 1
+#define HAVE_INTPTR_T 1
+
+#undef SIZEOF_LONG_LONG
 #define SIZEOF_LONG_LONG 8
 #define HAVE__BOOL 1
 
 #define HAVE_USLEEP 1
 #define HAVE_STRTOLL 1
+#undef HAVE_UTIME_H         /* no <utime.h> */
+
+\f
+/* -------------------- */
+/* OpenWatcom section.  */
+/* -------------------- */
+#elif defined __WATCOMC__
+
+#define OS_TYPE "Windows-Watcom"
+
+#define LL(n) n##LL
+
+#define stat_alias _stati64
+#define fstat_alias _fstati64
+#define struct_stat struct _stati64
+#define struct_fstat struct _stati64
+
+#ifdef ENABLE_IPV6
+# define NEED_GAI_STRERROR
+#endif
+
+#define HAVE_STDINT_H 1
+#define HAVE_INTTYPES_H 1
+
+/* Watcom 1.6 do have <stdbool.h>, but definition of '_Bool' is missing! */
+/* #define HAVE_STDBOOL_H 1 */
+#define HAVE_STRTOLL 1
+#define HAVE_UINT32_T 1
+#undef HAVE_UTIME_H
+#undef socklen_t                /* avoid clash with <ws2tcpip.h> */
+
+#undef SIZEOF_LONG_LONG
+#define SIZEOF_LONG_LONG 8
+
+/* OpenWatcom needs _WIN32_WINNT==0x0501 defined to pull in getaddrinfo()
+ * and freeaddrinfo() etc.
+ */
+#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501)
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
 
 \f
 #else