David Byron's fixes to make the latest curl build fine under MSVC 6.

diff --git a/CVS-INFO b/CVS-INFO
index 985b32c64583286b60708880d8cc4a9c0468bdf1..d004807fea2a00a751478b8dd8cae6897f46f718 100644 (file)
--- a/CVS-INFO
+++ b/CVS-INFO
@@ -25,7 +25,8 @@ Compile and build instructions follow below.
 
   perl/         is a subdirectory with various perl scripts
 
-To build after having extracted everything from CVS, do this:
+To build in environments that support configure, after having extracted
+everything from CVS, do this:
 
 ./buildconf
 ./configure
@@ -35,10 +36,15 @@ make
 
   ./configure --disable-shared --enable-debug --enable-maintainer-mode
 
+In environments that don't support configure (i.e. Microsoft), do this:
+
+buildconf.bat
+
 
 REQUIREMENTS
 
- You need the following software installed:
+ For buildconf (not buildconf.bat) to work, you need the following software
+installed:
 
  o autoconf 2.57  (or later)
  o automake 1.7   (or later)

diff --git a/Makefile.dist b/Makefile.dist
index 031ff297174daf1ce19592c849760e3490f43ff8..45593f4d33578f43ab022e29b08151c371f81e4d 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -43,27 +43,27 @@ mingw32-ssl:
 
 vc:
        cd lib
-       nmake -f Makefile.vc6 cfg=release
+       nmake /f Makefile.vc6 cfg=release
        cd ..\src
-       nmake -f Makefile.vc6
+       nmake /f Makefile.vc6
 
 vc-ssl:
        cd lib
-       nmake -f Makefile.vc6 cfg=release-ssl
+       nmake /f Makefile.vc6 cfg=release-ssl
        cd ..\src
-       nmake -f Makefile.vc6 cfg=release-ssl
+       nmake /f Makefile.vc6 cfg=release-ssl
 
 vc-ssl-dll:
        cd lib
-       nmake -f Makefile.vc6 cfg=release-ssl-dll
+       nmake /f Makefile.vc6 cfg=release-ssl-dll
        cd ..\src
-       nmake -f Makefile.vc6
+       nmake /f Makefile.vc6
 
 vc-libcurl-ssl-dll:
        cd lib
-       nmake -f Makefile.vc6 cfg=release-libcurl-ssl-dll
+       nmake /f Makefile.vc6 cfg=release-libcurl-ssl-dll
        cd ..\src
-       nmake -f Makefile.vc6
+       nmake /f Makefile.vc6
 
 djgpp:
        make -C lib -f Makefile.dj

diff --git a/include/curl/multi.h b/include/curl/multi.h
index 04a7dcc33560e5896c5046e9491d54ba7340045a..0ed48bf2b1747dad52e9fdddc5986559c06c1218 100644 (file)
--- a/include/curl/multi.h
+++ b/include/curl/multi.h
@@ -52,7 +52,7 @@
 #endif
 
 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
+#include <winsock2.h>
 #else
 
 #ifdef _AIX

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index e1deba6b88968590d0c46766a570fa620ec1c545..d84f17f3b2317d98bc1737efab2b3e18ed9b46c3 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -43,10 +43,10 @@ OPENSSL_PATH   = ../../openssl-0.9.7a
 CCNODBG   = cl.exe /MD /O2 /D "NDEBUG"\r
 CCDEBUG   = cl.exe /MDd /Od /Gm /Zi  /D "_DEBUG" /GZ\r
 CFLAGSSSL = /D "USE_SSLEAY" /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"\r
-CFLAGS = /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"\r
+CFLAGS = /I "." /I "../include" /nologo /W3 /GX /D "WIN32" /D "VC6" /D "_MBCS" /D "_LIB" /YX /FD /c /D "MSDOS"\r
 \r
 LNKDLL    = link.exe /DLL  /def:libcurl.def\r
-LNKLIB    = link.exe -lib\r
+LNKLIB    = link.exe /lib\r
 LFLAGS    = /nologo\r
 LINKLIBS  = ws2_32.lib winmm.lib\r
 SSLLIBS   = libeay32.lib ssleay32.lib\r
@@ -170,7 +170,7 @@ RESOURCE = $(DIROBJ)\libcurl.res
 # Usage\r
 #\r
 !IF "$(CFGSET)" == "FALSE"\r
-!MESSAGE Usage: nmake -f makefile.vc6 CFG=<config> <target>\r
+!MESSAGE Usage: nmake /f makefile.vc6 CFG=<config> <target>\r
 !MESSAGE where <config> is one of:\r
 !MESSAGE   release          - release static library\r
 !MESSAGE   release-dll      - release dll\r

diff --git a/lib/config-win32.h b/lib/config-win32.h
index 63847426d140d5160b05bf9e2cdacbdbfd672291..d6665896d0df7a1ad27e2b109ee51dd19994d745 100644 (file)
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -32,6 +32,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.  */

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index d8b65f0667d57090118b7667292faa2641cf052e..392df671dd71917be372a0d3fe47402b5d4c7819 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -28,7 +28,7 @@ LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
 ZLIB_PATH  = ../../zlib-1.1.4\r
 !ENDIF\r
 \r
-CFLAGS = /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
+CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
 LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386\r
 LINKLIBS = ws2_32.lib libcurl.lib winmm.lib zlib.lib\r
 LINKLIBS_DEBUG = ws2_32.lib libcurld.lib winmm.lib zlib.lib\r
@@ -49,14 +49,6 @@ DEBUG_OBJS= \
        homedird.obj \\r
        maind.obj\r
        \r
-LINK_OBJS= \\r
-       hugehelp.obj \\r
-       writeout.obj \\r
-       urlglob.obj \\r
-       getpass.obj \\r
-       homedir.obj \\r
-       main.obj\r
- \r
 ######################\r
 # release-ssl\r
  \r
@@ -67,44 +59,45 @@ OPENSSL_PATH   = ../../openssl-0.9.7a
 LFLAGSSSL = /LIBPATH:"$(OPENSSL_PATH)/out32"\r
 SSLLIBS   = libeay32.lib ssleay32.lib gdi32.lib \r
 LINKLIBS  = $(LINKLIBS) $(SSLLIBS)\r
+LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)\r
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
 !ENDIF\r
  \r
 all : release\r
 \r
 release: $(RELEASE_OBJS)\r
-       $(LINKR) $(LFLAGS) $(LINKLIBS) $(LINK_OBJS)\r
+       $(LINKR) $(LFLAGS) $(LINKLIBS) $(RELEASE_OBJS)\r
 \r
 debug: $(DEBUG_OBJS)\r
-       $(LINKD) $(LFLAGS) $(LINKLIBS_DEBUG) $(LINK_OBJS)\r
+       $(LINKD) $(LFLAGS) $(LINKLIBS_DEBUG) $(DEBUG_OBJS)\r
 \r
 ## Release\r
 hugehelpr.obj: hugehelp.c\r
-       $(CCR) $(CFLAGS) /Zm200 hugehelp.c\r
+       $(CCR) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c\r
 writeoutr.obj: writeout.c\r
-       $(CCR) $(CFLAGS) writeout.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" writeout.c\r
 urlglobr.obj: urlglob.c\r
-       $(CCR) $(CFLAGS) urlglob.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" urlglob.c\r
 getpassr.obj: getpass.c\r
-       $(CCR) $(CFLAGS) getpass.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" getpass.c\r
 homedirr.obj: homedir.c\r
-       $(CCR) $(CFLAGS) homedir.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" homedir.c\r
 mainr.obj: main.c\r
-       $(CCR) $(CFLAGS) main.c\r
+       $(CCR) $(CFLAGS) /Fo"$@" main.c\r
 \r
 ## Debug\r
 hugehelpd.obj: hugehelp.c\r
-       $(CCD) $(CFLAGS) /Zm200 hugehelp.c\r
+       $(CCD) $(CFLAGS) /Zm200 /Fo"$@" hugehelp.c\r
 writeoutd.obj: writeout.c\r
-       $(CCD) $(CFLAGS) writeout.c\r
+       $(CCD) $(CFLAGS) /Fo"$@" writeout.c\r
 urlglobd.obj: urlglob.c\r
-       $(CCD) $(CFLAGS) urlglob.c\r
+       $(CCD) $(CFLAGS) /Fo"$@" urlglob.c\r
 getpassd.obj: getpass.c\r
-       $(CCD) $(CFLAGS) getpass.c\r
+       $(CCD) $(CFLAGS) /Fo"$@" getpass.c\r
 homedird.obj: homedir.c\r
-       $(CCD) $(CFLAGS) homedir.c\r
+       $(CCD) $(CFLAGS) /Fo"$@" homedir.c\r
 maind.obj: main.c\r
-       $(CCD) $(CFLAGS) main.c\r
+       $(CCD) $(CFLAGS) /Fo"$@" main.c\r
 \r
 clean:\r
        -@erase homedir.obj\r

diff --git a/src/main.c b/src/main.c
index ded76944c10dbff899bed4fb96b694634c39c879..bda7f2b19873bb362085f69b397af260bae97396 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -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,8 +1017,13 @@ static int str2offset(curl_off_t *val, char *str)
    * 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 */