Juan F. Codagnone's fixes to build properly on Windows again

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index dfbd07a50be1d21afb18a60b011c162c8a7127e4..b2cda189db79d2f3e42136da3a41861a55219d4f 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -202,7 +202,9 @@ X_OBJS= \
        $(DIROBJ)\hash.obj \\r
        $(DIROBJ)\llist.obj \\r
        $(DIROBJ)\share.obj \\r
-       $(DIROBJ)\multi.obj\r
+       $(DIROBJ)\multi.obj \\r
+       $(DIROBJ)\http_digest.obj \\r
+       $(DIROBJ)\md5.obj\r
 \r
 all : $(TARGET)\r
 \r
@@ -224,3 +226,6 @@ clean:
        -@erase $(DIROBJ)\*.obj\r
        -@erase vc60.idb\r
        -@erase vc60.pch\r
+\r
+getdate.c: getdate.c.cvs\r
+       copy getdate.c.cvs getdate.c\r

diff --git a/lib/curllib.dsp b/lib/curllib.dsp
index ab711dc879ba8394375e5911c6d183079c39c388..6e432aec9a6f853649b0517fe3da57d99c272caf 100644 (file)
--- a/lib/curllib.dsp
+++ b/lib/curllib.dsp
@@ -389,6 +389,22 @@ SOURCE=.\url.h
 \r
 SOURCE=.\urldata.h\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\http_digest.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\md5.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\http_digest.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\md5.h\r
+# End Source File\r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 9aea5d143c36da481e595ce61cf7951254157ffb..f9ecb9a9cec0fe9832d46007ba8c3b7bce061817 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -101,3 +101,5 @@ clean:
 distrib: clean\r
        -@erase $(PROGRAM_NAME)\r
 \r
+hugehelp.c: hugehelp.c.cvs\r
+       copy hugehelp.c.cvs hugehelp.c\r

diff --git a/src/urlglob.c b/src/urlglob.c
index b7c84a7f636741e83c0b7d37a13d72d824320856..ace4712c209695d1240cd2c8acbb54f48335b347 100644 (file)
--- a/src/urlglob.c
+++ b/src/urlglob.c
@@ -29,8 +29,13 @@
 #include <string.h>
 #include <ctype.h>
 #include <curl/curl.h>
+
+#define _MPRINTF_REPLACE /* we want curl-functions instead of native ones */
+#include <curl/mprintf.h>
+
 #include "urlglob.h"
 
+
 #ifdef CURLDEBUG
 #include "../lib/memdebug.h"
 #endif