[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 079a4f79ce2078418a59ce0f32f0b8425e78ddea..b60154a4e10512f53f865ff4a0cd918aee915f8c 100644 (file)
--- 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 e1a6ffe77e65680e2d559f1adb2ec588a626a755..7c9eeea9addb275ff51962581d98bb3d91268a71 100644 (file)
--- 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 03ab6cd23f8c6c84c7ce608ca9c241b3899e00d6..3c2d10a64d1bfb3443b4056d1dbaa3528d1af8e6 100644 (file)
--- 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 54322d9dc1e514b8ec5ae533aa88409961d12ab3..4dbeb45c65cef56e31ff223ca7c01d4d7462f845 100644 (file)
--- 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