[svn] Fix broken MSVC compile.

[wget] / windows / config.h.ms

diff --git a/windows/config.h.ms b/windows/config.h.ms
index 60692de876107194cf9b1f19773dc8a000f05baf..aedbdf404daaa94f6a71481ef527921c1de36fde 100644 (file)
--- a/windows/config.h.ms
+++ b/windows/config.h.ms
@@ -19,32 +19,24 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+/* MS Visual C does not define __STDC__ when the MSC extensions are
+   enabled, but you need those extensions to compile <windows.h>.  */
+#if !defined(__STDC__) && defined(_MSC_EXTENSIONS)
+# define __STDC__ 1
+#endif
+
+/* Setting __STDC__ causes MSVC to break other stuff... */
+#if __STDC__ && defined(_MSC_VER)
+# define utimbuf _utimbuf
+# define O_RDONLY _O_RDONLY
+# define alloca _alloca
+#endif
+
 /* 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 */
+/* Microsoft and Watcom libraries have an alloca function. */
 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 */
@@ -173,9 +165,21 @@ char *alloca ();
 /* Define to 1 if ANSI function prototypes are usable.  */
 #define PROTOTYPES 1
 
+/* Define if we're compiling in support for MD5.  */
+#define HAVE_MD5 1
+
+/* Define if we're using Solaris libmd5.  */
+#undef HAVE_SOLARIS_MD5
+
+/* Define if we're using builtin (GNU) md5.c.  */
+#define HAVE_BUILTIN_MD5 1
+
 /* Work around VC 6 issues */
 #define inline __inline
 #define ftruncate chsize
 
+/* Define if you have the isatty function.  */
+#define HAVE_ISATTY 1
+
 #endif /* CONFIG_H */