X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=windows%2Fconfig.h.ms;h=56fe81f0406ce4042a482aca7259f7ffff70470d;hp=5078bd6735e701dbff3cffc7f7192c750d2676eb;hb=713ecfdca60257c645c6be6ae47b872b59fc050f;hpb=9c1c7f27cdbccbf838648253144f394f94513655

diff --git a/windows/config.h.ms b/windows/config.h.ms
index 5078bd67..56fe81f0 100644
--- a/windows/config.h.ms
+++ b/windows/config.h.ms
@@ -1,5 +1,6 @@
 /* Configuration header file.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 2004
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +14,17 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   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.  */
 
 
 #ifndef CONFIG_H
@@ -22,30 +33,6 @@
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
 
-/* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
 
@@ -62,9 +49,6 @@ char *alloca ();
    significant byte first).  */
 #undef WORDS_BIGENDIAN
 
-/* Define this if you want the NLS support.  */
-#undef ENABLE_NLS
-
 /* Define if you want the FTP support for Opie compiled in.  */
 #define USE_OPIE 1
 
@@ -72,7 +56,7 @@ char *alloca ();
 #define USE_DIGEST 1
 
 /* Define if you want the debug output support compiled in.  */
-#define DEBUG
+#define ENABLE_DEBUG 1
 
 /* Define if you have sys/time.h header. */
 #undef HAVE_SYS_TIME_H
@@ -108,10 +92,13 @@ char *alloca ();
 #define HAVE_STRERROR 1
 
 /* Define if you have the snprintf function.  */
-#undef HAVE_SNPRINTF
+#define HAVE_SNPRINTF 1
 
 /* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if you have the `strpbrk' function. */
+#define HAVE_STRPBRK 1
 
 /* Define if you have the strstr function. */
 #define HAVE_STRSTR 1
@@ -137,6 +124,11 @@ char *alloca ();
 /* Define if you have the <stdarg.h> header file.  */
 #define HAVE_STDARG_H 1
 
+/* Use ANSI-style stdargs regardless of whether the compiler bothers
+   to define __STDC__.  (Many don't when extensions are enabled.)
+   This define used to be in mswindows.h, but wheren't making any use there */
+#define WGET_USE_STDARG
+
 /* Define if you have the <stdlib.h> header file.  */
 #define HAVE_STDLIB_H 1
 
@@ -144,8 +136,15 @@ char *alloca ();
 #define HAVE_STRING_H 1
 
 /* Define if you have the <unistd.h> header file.  */
-/* #define HAVE_UNISTD_H 1 */
+#if !defined(_MSC_VER)
 #undef HAVE_UNISTD_H
+#endif
+
+/* None except Digital Mars have sleep/usleep functions */
+#if defined(__DMC__)
+#define HAVE_USLEEP 1
+#define HAVE_SLEEP 1
+#endif
 
 /* Define if you have the <utime.h> header file.  */
 #undef HAVE_UTIME_H
@@ -153,6 +152,12 @@ char *alloca ();
 /* Define if you have the <sys/utime.h> header file.  */
 #define HAVE_SYS_UTIME_H 1
 
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 
@@ -160,7 +165,7 @@ char *alloca ();
 #undef HAVE_PWD_H
 
 /* Define if you have the <signal.h> header file.  */
-#undef HAVE_SIGNAL_H
+#define HAVE_SIGNAL_H 1
 
 /* Define to be the name of the operating system.  */
 #define OS_TYPE "Windows"
@@ -189,5 +194,22 @@ char *alloca ();
 /* Define if you have the isatty function.  */
 #define HAVE_ISATTY 1
 
-#endif /* CONFIG_H */
+/* Define if you have the memmove function */
+#define HAVE_MEMMOVE 1
+
+/* Define to the length of short. */
+#define SIZEOF_SHORT 2
 
+/* Define to the length of int. */
+#define SIZEOF_INT 4
+
+/* Define to the length of long. */
+#define SIZEOF_LONG 4
+
+/* Defined to int or size_t on systems without socklen_t.  */
+#define socklen_t int
+
+/* Define if you have uint32_t.  */
+#undef HAVE_UINT32_T
+
+#endif /* CONFIG_H */