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

diff --git a/windows/config-compiler.h b/windows/config-compiler.h
index cfef180f..a71fb429 100644
--- a/windows/config-compiler.h
+++ b/windows/config-compiler.h
@@ -1,5 +1,5 @@
 /* Support for various Windows compilation environments.
-   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -16,15 +16,16 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 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
@@ -82,6 +83,7 @@ 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 */
@@ -127,6 +129,7 @@ so, delete this exception statement from your version.  */
 #if _MSC_VER >= 1400
 #pragma warning ( disable : 4996 )
 #define _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_WARNINGS
 #endif
 
 
@@ -205,8 +208,13 @@ so, delete this exception statement from your version.  */
 #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 */
+/* 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
 #undef HAVE_UTIME_H