From: hniksic <devnull@localhost>
Date: Tue, 23 Jan 2001 14:27:40 +0000 (-0800)
Subject: [svn] Changes according to Herold Heiko's instructions how to make alloca()
X-Git-Tag: v1.13~2283
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=2f6cd9d698acbee2ffcf60d6b6d04ad5d84324fc

[svn] Changes according to Herold Heiko's instructions how to make alloca()
work under Windows: don't try to compile alloca.c, *and* don't forget
to include <malloc.h>.

Published in <sxsbssyibsu.fsf@florida.arsdigita.de>.
---

diff --git a/ChangeLog b/ChangeLog
index 079a4f79..b60154a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-23  Herold Heiko  <Heiko.Herold@previnet.it>
+
+	* windows/Makefile.src: Don't attempt to compile in alloca.c; it
+	doesn't work and it's not needed.
+
 2001-01-16  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* NEWS: Added more NEWS items.
diff --git a/src/ChangeLog b/src/ChangeLog
index e1a6ffe7..7c9eeea9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-23  Herold Heiko  <Heiko.Herold@previnet.it>
+
+	* mswindows.h: Include <malloc.h>; it's needed for alloca().
+
 2001-01-10  Dan Harkless  <wget@harkless.org>
 
 	* url.c (str_url): Clarified this function's comment header after
diff --git a/src/mswindows.h b/src/mswindows.h
index 03ab6cd2..3c2d10a6 100644
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -20,6 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef MSWINDOWS_H
 #define MSWINDOWS_H
 
+/* Apparently needed for alloca(). */
+#include <malloc.h>
+
 #ifndef S_ISDIR
 # define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))
 #endif
diff --git a/windows/Makefile.src b/windows/Makefile.src
index 54322d9d..4dbeb45c 100644
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -46,11 +46,11 @@ LINK    = $(LD) $(LDFLAGS) $(DEBUGLF) /out:$@
 
 RM      = del
 
-SRC = alloca.c cmpt.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c ftp-ls.c \
+SRC = cmpt.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c ftp-ls.c \
       ftp-opie.c ftpparse.c getopt.c hash.c headers.c html-parse.c html-url.c retr.c recur.c url.c init.c utils.c main.c \
       version.c mswindows.c fnmatch.c md5.c rbuf.c log.c
 
-OBJ = alloca$o cmpt$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o ftp-ls$o \
+OBJ = cmpt$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o ftp-ls$o \
       ftp-opie$o ftpparse$o getopt$o hash$o headers$o html-parse$o html-url$o retr$o recur$o url$o init$o utils$o main$o \
       version$o mswindows$o fnmatch$o md5$o rbuf$o log$o