X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=windows%2Fconfig-compiler.h;h=a71fb42996bf6571d724c8d37fc6a1ece207753a;hp=a4435ef99075883ae370cf04f363a99c049a2102;hb=bc7ea11d8eac6f2378731b98172d9f9facab3e78;hpb=645d028ddb21ec0dfe23afd355bc7ad0023b04cb

diff --git a/windows/config-compiler.h b/windows/config-compiler.h
index a4435ef9..a71fb429 100644
--- a/windows/config-compiler.h
+++ b/windows/config-compiler.h
@@ -1,11 +1,11 @@
 /* Support for various Windows compilation environments.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
 
 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,18 +14,18 @@ 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 <http://www.gnu.org/licenses/>.
 
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables.  You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL".  If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so.  If you do not wish to do
-so, delete this exception statement from your version.  */
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
 
 
 /* This file contains information about various compilers used to
@@ -83,14 +83,23 @@ so, delete this exception statement from your version.  */
 
 /* MinGW and GCC support some POSIX and C99 features.  */
 #define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
 
 #define HAVE__BOOL 1
 #undef SIZEOF_LONG_LONG		/* avoid redefinition warning */
 #define SIZEOF_LONG_LONG 8
-#define HAVE_INTPTR_T 1 
+#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. */
@@ -112,12 +121,20 @@ so, delete this exception statement from your version.  */
 # define HAVE__STRTOI64 1
 #endif
 
+#if _MSC_VER >= 1310
+#define HAVE_INTPTR_T 1
+#define HAVE_UINTPTR_T 1
+#endif
+
 #if _MSC_VER >= 1400
 #pragma warning ( disable : 4996 )
 #define _CRT_SECURE_NO_DEPRECATE
-#define HAVE_SYS_UTIME_H 1
-#undef HAVE_UTIME_H
+#define _CRT_SECURE_NO_WARNINGS
 #endif
+
+
+#undef HAVE_UTIME_H         /* no <utime.h> */
+
 
 /* ------------------ */
 /* Borland C section. */
@@ -158,12 +175,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 <utime.h> */
 
 
 /* -------------------- */
@@ -186,15 +207,30 @@ so, delete this exception statement from your version.  */
 
 #define HAVE_STDINT_H 1
 #define HAVE_INTTYPES_H 1
+
+/* OpenWatcom 1.6 do have <stdbool.h>, but definition of '_Bool' is missing! */
+/* This was fixed in OpenWatcom 1.7 */
+#if __WATCOMC__ >= 1270
 #define HAVE_STDBOOL_H 1
+#define HAVE__BOOL 1
+#endif
+
 #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 <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
+
 
 #else
 # error Your compiler is not supported.