From e8593456f990ac1abf4b150ad920d81ad7de4a93 Mon Sep 17 00:00:00 2001 From: hniksic Date: Sat, 28 Apr 2001 07:02:29 -0700 Subject: [PATCH] [svn] Commit Herold Heiko's fixes for compilation under Windows. --- ChangeLog | 9 +++++++++ windows/Makefile.src | 14 ++++++++------ windows/config.h.ms | 5 +++++ windows/wget.dep | 2 ++ 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index df1fef29..39124688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-04-28 Herold Heiko + + * windows/wget.dep: Update. + + * windows/Makefile.src: Update. + + * windows/config.h.ms: Define inline to __inline. + Define ftruncate to chsize. + 2001-04-27 Hrvoje Niksic * po/hr.po: Updated. diff --git a/windows/Makefile.src b/windows/Makefile.src index 0dea915c..7fb8cceb 100644 --- a/windows/Makefile.src +++ b/windows/Makefile.src @@ -46,13 +46,15 @@ LINK = $(LD) $(LDFLAGS) $(DEBUGLF) /out:$@ RM = del -SRC = cmpt.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c ftp-ls.c \ - ftp-opie.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 +SRC = cmpt.c safe-ctype.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c \ + ftp-ls.c ftp-opie.c getopt.c hash.c headers.c html-parse.c html-url.c \ + retr.c recur.c url.c cookies.c init.c utils.c main.c version.c \ + mswindows.c fnmatch.c md5.c rbuf.c log.c -OBJ = cmpt$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o ftp-ls$o \ - ftp-opie$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 +OBJ = cmpt$o safe-ctype$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o \ + ftp-ls$o ftp-opie$o getopt$o hash$o headers$o html-parse$o html-url$o \ + retr$o recur$o url$o cookies$o init$o utils$o main$o version$o \ + mswindows$o fnmatch$o md5$o rbuf$o log$o .SUFFIXES: .c .obj diff --git a/windows/config.h.ms b/windows/config.h.ms index 307dd4c7..60692de8 100644 --- a/windows/config.h.ms +++ b/windows/config.h.ms @@ -173,4 +173,9 @@ char *alloca (); /* Define to 1 if ANSI function prototypes are usable. */ #define PROTOTYPES 1 +/* Work around VC 6 issues */ +#define inline __inline +#define ftruncate chsize + #endif /* CONFIG_H */ + diff --git a/windows/wget.dep b/windows/wget.dep index dd91c626..c596bd6f 100644 --- a/windows/wget.dep +++ b/windows/wget.dep @@ -2,6 +2,7 @@ alloca$o: alloca.c ansi2knr$o: ansi2knr.c cmpt$o: cmpt.c config.h wget.h sysdep.h options.h connect$o: connect.c config.h wget.h sysdep.h options.h connect.h host.h +cookies$o: cookies.c wget.h cookies.h hash.h url.h utils.h fnmatch$o: fnmatch.c config.h wget.h sysdep.h options.h fnmatch.h ftp-basic$o: ftp-basic.c config.h wget.h sysdep.h options.h utils.h rbuf.h connect.h host.h ftp-ls$o: ftp-ls.c config.h wget.h sysdep.h options.h utils.h ftp.h url.h @@ -24,6 +25,7 @@ netrc$o: netrc.c wget.h sysdep.h options.h utils.h netrc.h init.h rbuf$o: rbuf.c config.h wget.h sysdep.h options.h rbuf.h connect.h recur$o: recur.c config.h wget.h sysdep.h options.h url.h recur.h utils.h retr.h ftp.h fnmatch.h host.h hash.h retr$o: retr.c config.h wget.h sysdep.h options.h utils.h retr.h url.h recur.h ftp.h host.h connect.h hash.h +safe-ctype$o: safe-ctype.c safe-ctype.h url$o: url.c config.h wget.h sysdep.h options.h utils.h url.h host.h utils$o: utils.c config.h wget.h sysdep.h options.h utils.h fnmatch.h hash.h version$o: version.c