Herold Heiko <[EMAIL PROTECTED]> writes:
> Ok. A simple solution is the following (no diff since there are long
> lines and it's not worth an attachment):
> -remove alloca.c / alloca$o from windows\Makefile.src
> -add #include <malloc.h> in #ifdef WINDOWS in src\sysdep.h, about line
> 44 currently.
>
> I don't know however if these modifications are the "correct" ones.
That sounds perfectly fine to me. I've modified them slightly: I put
#include <malloc.h> to mswindows.h.
Here is what I applied to the CVS:
Index: ChangeLog
===================================================================
RCS file: /pack/anoncvs/wget/ChangeLog,v
retrieving revision 1.57
diff -u -r1.57 ChangeLog
--- ChangeLog 2001/01/16 21:19:36 1.57
+++ ChangeLog 2001/01/23 14:25:39
@@ -1,3 +1,8 @@
+2001-01-23 Herold Heiko <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* NEWS: Added more NEWS items.
Index: src/ChangeLog
===================================================================
RCS file: /pack/anoncvs/wget/src/ChangeLog,v
retrieving revision 1.112
diff -u -r1.112 ChangeLog
--- src/ChangeLog 2001/01/11 06:16:46 1.112
+++ src/ChangeLog 2001/01/23 14:25:42
@@ -1,3 +1,7 @@
+2001-01-23 Herold Heiko <[EMAIL PROTECTED]>
+
+ * mswindows.h: Include <malloc.h>; it's needed for alloca().
+
2001-01-10 Dan Harkless <[EMAIL PROTECTED]>
* url.c (str_url): Clarified this function's comment header after
Index: src/mswindows.h
===================================================================
RCS file: /pack/anoncvs/wget/src/mswindows.h,v
retrieving revision 1.2
diff -u -r1.2 mswindows.h
--- src/mswindows.h 2000/11/16 16:37:49 1.2
+++ src/mswindows.h 2001/01/23 14:25:42
@@ -20,6 +20,9 @@
#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
Index: windows/Makefile.src
===================================================================
RCS file: /pack/anoncvs/wget/windows/Makefile.src,v
retrieving revision 1.4
diff -u -r1.4 Makefile.src
--- windows/Makefile.src 2001/01/11 16:34:36 1.4
+++ windows/Makefile.src 2001/01/23 14:25:42
@@ -46,11 +46,11 @@
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
