Index: docs/INSTALL
===================================================================
RCS file: /repository/curl/docs/INSTALL,v
retrieving revision 1.49
diff -u -r1.49 INSTALL
--- docs/INSTALL	2 Feb 2004 15:34:09 -0000	1.49
+++ docs/INSTALL	24 Feb 2004 01:44:12 -0000
@@ -144,7 +144,7 @@
       Microsoft command line style
       ----------------------------
         Run the 'vcvars32.bat' file to get the proper environment variables
-        set, then run 'nmake vc' in the root dir.
+        set, then run 'nmake /f Makefile.dist vc' in the root dir.
 
         The vcvars32.bat file is part of the Microsoft development
         environment.
@@ -212,8 +212,9 @@
 
           set ZLIB_PATH=c:\zlib-1.1.4
 
-        Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
-        directory.  'nmake vc-ssl' will create a libcurl static and dynamic
+        Then run 'nmake /f Makefile.dist vc-ssl' or
+        'nmake /f Makefile.dist vc-ssl-dll' in curl's root directory.
+        'nmake vc-ssl' will create a libcurl static and dynamic
         libraries in the lib subdirectory, as well as a statically linked
         version of curl.exe in the src subdirectory.  This statically linked
         version is a standalone executable not requiring any DLL at
Index: include/curl/multi.h
===================================================================
RCS file: /repository/curl/include/curl/multi.h,v
retrieving revision 1.15
diff -u -r1.15 multi.h
--- include/curl/multi.h	7 Jan 2004 09:19:34 -0000	1.15
+++ include/curl/multi.h	24 Feb 2004 01:44:13 -0000
@@ -52,7 +52,7 @@
 #endif
 
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
+#include <winsock2.h>
 #else
 
 #ifdef _AIX
Index: lib/Makefile.vc6
===================================================================
RCS file: /repository/curl/lib/Makefile.vc6,v
retrieving revision 1.39
diff -u -r1.39 Makefile.vc6
--- lib/Makefile.vc6	5 Jan 2004 22:29:32 -0000	1.39
+++ lib/Makefile.vc6	24 Feb 2004 01:44:13 -0000
@@ -43,7 +43,7 @@
 CCNODBG   = cl.exe /MD /O2 /D "NDEBUG"
 CCDEBUG   = cl.exe /MDd /Od /Gm /Zi  /D "_DEBUG" /GZ
 CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
-CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
+CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"
 
 LNKDLL    = link.exe /DLL  /def:libcurl.def
 LNKLIB    = link.exe -lib
@@ -233,11 +233,18 @@
 all : $(TARGET)
 
 
-$(TARGET): $(X_OBJS)
+$(TARGET): ca-bundle.h $(X_OBJS)
 	$(LNK) $(LFLAGS) $(LINKLIBS) $(X_OBJS)
 
 $(X_OBJS): $(DIROBJ)
 
+ca-bundle.h : $(DIROBJ)
+	echo /* This file is generated automatically */ > $@
+	echo #define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE") >>$@
+
+getdate.c : getdate.c.cvs
+	copy getdate.c.cvs $@
+
 $(DIROBJ):
 	@if not exist "$(DIROBJ)" mkdir $(DIROBJ)
 
Index: lib/config-win32.h
===================================================================
RCS file: /repository/curl/lib/config-win32.h,v
retrieving revision 1.10
diff -u -r1.10 config-win32.h
--- lib/config-win32.h	23 Feb 2004 11:59:28 -0000	1.10
+++ lib/config-win32.h	24 Feb 2004 01:44:13 -0000
@@ -1,6 +1,9 @@
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
+#ifndef __CONFIG_WIN32_H
+#define __CONFIG_WIN32_H
+
 /* Define if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
@@ -32,6 +35,10 @@
 #endif
 
 /* The size of a `curl_off_t', as computed by sizeof. */
+#ifdef SIZEOF_CURL_OFF_T
+#undef SIZEOF_CURL_OFF_T
+#endif
+
 #define SIZEOF_CURL_OFF_T 8
 
 /* Define if you have the ANSI C header files.  */
@@ -250,3 +257,5 @@
                                    type definition in parentheses */
 #pragma warning (disable: 4206) /* this does what? */
 #endif
+
+#endif
Index: src/Makefile.vc6
===================================================================
RCS file: /repository/curl/src/Makefile.vc6,v
retrieving revision 1.16
diff -u -r1.16 Makefile.vc6
--- src/Makefile.vc6	23 Nov 2003 22:26:40 -0000	1.16
+++ src/Makefile.vc6	24 Feb 2004 01:44:14 -0000
@@ -28,27 +28,11 @@
 ZLIB_PATH  = ../../zlib-1.1.4
 !ENDIF
 
-CFLAGS = /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386
 LINKLIBS = ws2_32.lib libcurl.lib winmm.lib zlib.lib
 LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib zlib.lib
 
-RELEASE_OBJS= \
-	hugehelpr.obj \
-	writeoutr.obj \
-	urlglobr.obj \
-	getpassr.obj \
-	homedirr.obj \
-	mainr.obj
-
-DEBUG_OBJS= \
-	hugehelpd.obj \
-	writeoutd.obj \
-	urlglobd.obj \
-	getpassd.obj \
-	homedird.obj \
-	maind.obj
-	
 LINK_OBJS= \
 	hugehelp.obj \
 	writeout.obj \
@@ -72,44 +56,17 @@
  
 all : release
 
-release: $(RELEASE_OBJS)
+release: $(LINK_OBJS)
 	$(LINKR) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)
 
-debug: $(DEBUG_OBJS)
+debug: $(LINK_OBJS)
 	$(LINKD) $(LFLAGS) $(LINKLIBS_DEBUG) $(LINK_OBJS)
 
-## Release
-hugehelpr.obj: hugehelp.c
-	$(CCR) $(CFLAGS) /Zm200 hugehelp.c
-writeoutr.obj: writeout.c
-	$(CCR) $(CFLAGS) writeout.c
-urlglobr.obj: urlglob.c
-	$(CCR) $(CFLAGS) urlglob.c
-getpassr.obj: getpass.c
-	$(CCR) $(CFLAGS) getpass.c
-homedirr.obj: homedir.c
-	$(CCR) $(CFLAGS) homedir.c
-mainr.obj: main.c
-	$(CCR) $(CFLAGS) main.c
-
-## Debug
-hugehelpd.obj: hugehelp.c
-	$(CCD) $(CFLAGS) /Zm200 hugehelp.c
-writeoutd.obj: writeout.c
-	$(CCD) $(CFLAGS) writeout.c
-urlglobd.obj: urlglob.c
-	$(CCD) $(CFLAGS) urlglob.c
-getpassd.obj: getpass.c
-	$(CCD) $(CFLAGS) getpass.c
-homedird.obj: homedir.c
-	$(CCD) $(CFLAGS) homedir.c
-maind.obj: main.c
-	$(CCD) $(CFLAGS) main.c
+hugehelp.c : hugehelp.c.cvs
+	copy hugehelp.c.cvs $@
 
 clean:
-	-@erase homedir.obj
-	-@erase hugehelp.obj
-	-@erase main.obj
+	-@erase $(LINK_OBJS)
 	-@erase vc60.idb
 	-@erase vc60.pdb
 	-@erase vc60.pch
Index: src/main.c
===================================================================
RCS file: /repository/curl/src/main.c,v
retrieving revision 1.237
diff -u -r1.237 main.c
--- src/main.c	21 Feb 2004 15:08:21 -0000	1.237
+++ src/main.c	24 Feb 2004 01:44:18 -0000
@@ -52,7 +52,7 @@
 #define CURLseparator	"--_curl_--"
 
 #if defined(WIN32)&&!defined(__CYGWIN32__)
-#include <winsock.h>
+#include <winsock2.h>
 #endif
 
 #ifdef TIME_WITH_SYS_TIME
@@ -1017,9 +1017,14 @@
    * definitions for LLONG_{MIN,MAX} or LONG_LONG_{MIN,MAX}.
    */
 #ifndef LLONG_MAX
+#ifdef _MSC_VER
+#define LLONG_MAX (curl_off_t)0x7FFFFFFFFFFFFFFFi64
+#define LLONG_MIN (curl_off_t)0x8000000000000000i64
+#else
 #define LLONG_MAX (curl_off_t)0x7FFFFFFFFFFFFFFFLL
 #define LLONG_MIN (curl_off_t)0x8000000000000000LL
 #endif
+#endif
 
   /* this is a duplicate of the function that is also used in libcurl */
   *val = strtoofft(str, NULL, 0);