From: abbotti <devnull@localhost>
Date: Wed, 20 Mar 2002 19:04:22 +0000 (-0800)
Subject: [svn] Removed conditional cruft in windows/config.h.* that was there for
X-Git-Tag: v1.13~1828
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=199676dbcb7b5dd41de50162d7b9bc0aa229c91a

[svn] Removed conditional cruft in windows/config.h.* that was there for
Unix-like systems.
Submitted by Ian Abbott in <3C98D4FD.23721.2823B6@localhost>.
---

diff --git a/ChangeLog b/ChangeLog
index 3b41ff97..d8f14b99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-20  Ian Abbott  <abbotti@mev.co.uk>
+
+	* windows/config.h.bor:
+	* windows/config.h.ms:
+	Removed conditional cruft that was there for Unix-like systems.
+
 2002-03-20  Ian Abbott  <abbotti@mev.co.uk>
 
 	* * windows/wget.dep: Fix dependencies for target mswindows$o
diff --git a/windows/config.h.bor b/windows/config.h.bor
index be6db5a5..60a629e0 100644
--- a/windows/config.h.bor
+++ b/windows/config.h.bor
@@ -26,29 +26,8 @@
 /* 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 */
-#    include <malloc.h>
-#   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
+/* For Borland C++ 5.5, alloca is defined in the <malloc.h> header file. */
+#include <malloc.h>
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
diff --git a/windows/config.h.ms b/windows/config.h.ms
index 5078bd67..89c01a52 100644
--- a/windows/config.h.ms
+++ b/windows/config.h.ms
@@ -22,29 +22,8 @@
 /* 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 */