X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=windows%2Fconfig-compiler.h;h=fbd139bec70ef0540573fca7d997200bde4b26c8;hb=4d7c5e087b2bc82c9f503dff003916d1047903ce;hp=f0bcccc289d6a1337462576652eb8c45301f3192;hpb=42231a47c3bfa87cd9c103655f7715b1942afc0a;p=wget diff --git a/windows/config-compiler.h b/windows/config-compiler.h index f0bcccc2..fbd139be 100644 --- a/windows/config-compiler.h +++ b/windows/config-compiler.h @@ -5,7 +5,7 @@ This file is part of GNU Wget. GNU Wget is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +the Free Software Foundation; either version 3 of the License, or (at your option) any later version. GNU Wget is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ 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., -51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +along with Wget. If not, see . In addition, as a special exception, the Free Software Foundation gives permission to link the code of its release of Wget with the @@ -87,8 +86,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 + +/* 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 + /* -------------------- */ /* MS Visual C section. */ @@ -109,6 +118,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 + +#undef HAVE_UTIME_H /* no */ + /* ------------------ */ /* Borland C section. */ @@ -149,12 +166,16 @@ so, delete this exception statement from your version. */ #define HAVE_STDBOOL_H 1 #define HAVE_UINT32_T 1 +#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 */ /* -------------------- */ @@ -177,15 +198,25 @@ so, delete this exception statement from your version. */ #define HAVE_STDINT_H 1 #define HAVE_INTTYPES_H 1 -#define HAVE_STDBOOL_H 1 + +/* Watcom 1.6 do have , but definition of '_Bool' is missing! */ +/* #define HAVE_STDBOOL_H 1 */ #define HAVE_STRTOLL 1 #define HAVE_UINT32_T 1 -#define HAVE_SYS_UTIME_H 1 #undef HAVE_UTIME_H #undef socklen_t /* avoid clash with */ #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 + #else # error Your compiler is not supported.