Hi,

--- Daniel Stenberg <Daniel.Stenberg_at_haxx.nu> wrote:
> I cannot apply fixes for your platform/compiler combination
> that will undoubtly ruin someone else combination.
>

I understand.

>
> Please, send me patches made with 'diff -c' or 'diff -u'. I can't
> apply plain diffs without getting lots of problems.
>

OK, I hope this doesn't get messed up by the Yahoo mailer...

===================================================================
RCS file: RCS/makefile.vc6,v
retrieving revision 1.1
diff -u -r1.1 makefile.vc6
--- makefile.vc6 2000/03/16 19:11:25 1.1
+++ makefile.vc6 2000/03/17 00:32:54
@@ -23,7 +23,7 @@
 CCRS = cl.exe /ML /O2 /D "NDEBUG" /D "USE_SSLEAY" /I
"$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"
 LINKRS = link.exe -lib /LIBPATH:$(OPENSSL_PATH)/out32dll

-CFLAGS = /nologo /W3 /GX /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
+CFLAGS = /nologo /I "../include" /W3 /GX /D "WIN32" /D "_MBCS" /D
"_LIB" /YX /FD /c
 LFLAGS = /nologo /out:$(PROGRAM_NAME)
 LINKLIBS = kernel32.lib wsock32.lib
 LINKSLIBS = libeay32.lib ssleay32.lib RSAglue.lib
@@ -36,6 +36,7 @@
        formdatar.obj \
        ftpr.obj \
        httpr.obj \
+ ldapr.obj \
        dictr.obj \
        telnetr.obj \
        getdater.obj \
@@ -50,9 +51,9 @@
        speedcheckr.obj \
        ssluser.obj \
        timevalr.obj \
- uploadr.obj \
        urlr.obj \
        filer.obj \
+ writeoutr.obj \
        versionr.obj

 DEBUG_OBJS= \
@@ -63,6 +64,7 @@
        formdatad.obj \
        ftpd.obj \
        httpd.obj \
+ ldapd.obj \
        dictd.obj \
        telnetd.obj \
        getdated.obj \
@@ -77,9 +79,9 @@
        speedcheckd.obj \
        sslused.obj \
        timevald.obj \
- uploadd.obj \
        urld.obj \
        filed.obj \
+ writeoutd.obj \
        versiond.obj

 RELEASE_SSL_OBJS= \
@@ -90,6 +92,7 @@
        formdatars.obj \
        ftprs.obj \
        httprs.obj \
+ ldaprs.obj \
        dictrs.obj \
        telnetrs.obj \
        getdaters.obj \
@@ -104,9 +107,9 @@
        speedcheckrs.obj \
        sslusers.obj \
        timevalrs.obj \
- uploadrs.obj \
        urlrs.obj \
        filers.obj \
+ writeouts.obj \
        versionrs.obj

 LINK_OBJS= \
@@ -117,6 +120,7 @@
        formdata.obj \
        ftp.obj \
        http.obj \
+ ldap.obj \
        dict.obj \
        telnet.obj \
        getdate.obj \
@@ -131,9 +135,9 @@
        speedcheck.obj \
        ssluse.obj \
        timeval.obj \
- upload.obj \
        url.obj \
        file.obj \
+ writeout.obj \
        version.obj

 all : release
@@ -163,6 +167,8 @@
        $(CCR) $(CFLAGS) ftp.c
 httpr.obj: http.c
        $(CCR) $(CFLAGS) http.c
+ldapr.obj: ldap.c
+ $(CCR) $(CFLAGS) ldap.c
 dictr.obj: dict.c
        $(CCR) $(CFLAGS) dict.c
 telnetr.obj: telnet.c
@@ -191,12 +197,12 @@
        $(CCR) $(CFLAGS) ssluse.c
 timevalr.obj: timeval.c
        $(CCR) $(CFLAGS) timeval.c
-uploadr.obj: upload.c
- $(CCR) $(CFLAGS) upload.c
 urlr.obj: url.c
        $(CCR) $(CFLAGS) url.c
 filer.obj: file.c
        $(CCR) $(CFLAGS) file.c
+writeoutr.obj: writeout.c
+ $(CCR) $(CFLAGS) writeout.c
 versionr.obj: version.c
        $(CCR) $(CFLAGS) version.c

@@ -215,6 +221,8 @@
        $(CCD) $(CFLAGS) ftp.c
 httpd.obj: http.c
        $(CCD) $(CFLAGS) http.c
+ldapd.obj: ldap.c
+ $(CCD) $(CFLAGS) ldap.c
 dictd.obj: dict.c
        $(CCD) $(CFLAGS) dict.c
 telnetd.obj: telnet.c
@@ -243,12 +251,12 @@
        $(CCD) $(CFLAGS) ssluse.c
 timevald.obj: timeval.c
        $(CCD) $(CFLAGS) timeval.c
-uploadd.obj: upload.c
- $(CCD) $(CFLAGS) upload.c
 urld.obj: url.c
        $(CCD) $(CFLAGS) url.c
 filed.obj: file.c
        $(CCD) $(CFLAGS) file.c
+writeoutd.obj: writeout.c
+ $(CCD) $(CFLAGS) writeout.c
 versiond.obj: version.c
        $(CCD) $(CFLAGS) version.c

@@ -268,6 +276,8 @@
        $(CCRS) $(CFLAGS) ftp.c
 httprs.obj: http.c
        $(CCRS) $(CFLAGS) http.c
+ldaprs.obj: ldap.c
+ $(CCRS) $(CFLAGS) ldap.c
 dictrs.obj: dict.c
        $(CCRS) $(CFLAGS) dict.c
 telnetrs.obj: telnet.c
@@ -296,12 +306,12 @@
        $(CCRS) $(CFLAGS) ssluse.c
 timevalrs.obj: timeval.c
        $(CCRS) $(CFLAGS) timeval.c
-uploadrs.obj: upload.c
- $(CCRS) $(CFLAGS) upload.c
 urlrs.obj: url.c
        $(CCRS) $(CFLAGS) url.c
 filers.obj: file.c
        $(CCRS) $(CFLAGS) file.c
+writeouts.obj: writeout.c
+ $(CCRS) $(CFLAGS) writeout.c
 versionrs.obj: version.c
        $(CCRS) $(CFLAGS) version.c

__________________________________________________
Do You Yahoo!?
Talk to your friends online with Yahoo! Messenger.
http://im.yahoo.com
Received on 2000-03-17