Merged with eleven for Gisle's mswindows.c patch.

[wget] / windows / config-compiler.h

diff --git a/windows/config-compiler.h b/windows/config-compiler.h
index 033f470dd5b830ddf20bbee68e5dc2d0aa810260..cfef180fad2c9f79b38adb0d6da97da61ae82eb2 100644 (file)
--- 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 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,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 <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
@@ -87,7 +86,7 @@ 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_INTPTR_T 1
 #define HAVE_UINTPTR_T 1
 #define HAVE_STRTOLL 1
 \f
@@ -120,10 +119,16 @@ 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
 #endif
+
 \f
 #undef HAVE_UTIME_H         /* no <utime.h> */