[svn] Commit Herold Heiko's fixes for compilation under Windows.

diff --git a/ChangeLog b/ChangeLog
index df1fef29354d9688d15f52a6097c4e17e5a23e17..391246885e2d2e2f10318f7428d3bda456ff1b8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-28  Herold Heiko  <Heiko.Herold@previnet.it>
+
+       * 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  <hniksic@arsdigita.com>
 
        * po/hr.po: Updated.

diff --git a/windows/Makefile.src b/windows/Makefile.src
index 0dea915cf5dc785dc8382322d9c636b0f7e4aebc..7fb8ccebc13b411ed9243ff3dace2ac5d1206c6a 100644 (file)
--- 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
-
-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
+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 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 307dd4c79002cfa6ae141f08540007f1758a8550..60692de876107194cf9b1f19773dc8a000f05baf 100644 (file)
--- 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 dd91c626793393009345b23e035d66883142b9b9..c596bd6f4271ec5e404155072764f5bbbfe3f173 100644 (file)
--- 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