Commit 4515d064 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

parent b6a4ca9b

CVS-INFO

+8 −2
Original line number Diff line number Diff line
@@ -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)

Makefile.dist

+8 −8
Original line number Diff line number Diff line
@@ -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

include/curl/multi.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#endif



#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)

#include <winsock.h>

#include <winsock2.h>

#else



#ifdef _AIX

lib/Makefile.vc6

+3 −3
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ OPENSSL_PATH = ../../openssl-0.9.7a 
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

LNKLIB    = link.exe /lib

LFLAGS    = /nologo

LINKLIBS  = ws2_32.lib winmm.lib

SSLLIBS   = libeay32.lib ssleay32.lib
@@ -170,7 +170,7 @@ RESOURCE = $(DIROBJ)\libcurl.res 
# Usage

#

!IF "$(CFGSET)" == "FALSE"

!MESSAGE Usage: nmake -f makefile.vc6 CFG=<config> <target>

!MESSAGE Usage: nmake /f makefile.vc6 CFG=<config> <target>

!MESSAGE where <config> is one of:

!MESSAGE   release          - release static library

!MESSAGE   release-dll      - release dll

lib/config-win32.h

+4 −0
Original line number Diff line number Diff line
@@ -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.  */