Re: [PATCH 1/2] http.c: fix compiling with libcurl 7.9.2

From: Mike Ralphson <mike.ralphson@gmail.com>
Date: Jun 18, 2009, 16:26 UTC
Message-ID: <e2b179460906180926h47070d2aw4a50e3a8547cfb61@mail.gmail.com>
In-Reply-To: <7v63eyp10m.fsf@alter.siamese.dyndns.org>

2009/6/15 Junio C Hamano <gitster@pobox.com>

Show 10 quoted lines

>
> Mark Lodato <lodatom@gmail.com> writes:
> > Note that git still does not compile on libcurl before 7.9.1 or below,
> > since CURLOPT_FTP_USE_EPSV (http.c:236) is defined in libcurl 7.9.2.
>
> I think we didn't quite follow an old thread through, then.
>
> Cf. http://thread.gmane.org/gmane.comp.version-control.git/113985/focus=114014
>
> Both Mike's in the thread Cc'ed.

Yep, apologies for having dropped the ball on this. I had got back to it but parked it again while Ray Chaun's series was in flight.

Will be offline for a couple of weeks around solstice / Glastonbury but able to pick it up again after that if no-one beats me to it. I've noted Daniel's point below also:

2009/6/12 Daniel Stenberg <daniel@haxx.se>:

Show 12 quoted lines

> On Thu, 11 Jun 2009, Junio C Hamano wrote:
>
>>   #if !defined(CURLOPT_KEYPASSWD)
>>   # if defined(CURLOPT_SSLKEYPASSWD)
>>   #  define CURLOPT_KEYTPASSWD CURLOPT_SSLKEYPASSWD
>>   # elif defined(CURLOPT_SSLCERTPASSWD
>>   #  define CURLOPT_KEYTPASSWD CURLOPT_SSLCERTPASSWD
>>   # endif
>>   #endif
>
> Just note that these CURLOPT_* symbols provided by libcurl are enums, not
> defines, so unfortunately you can't do it this exact #ifdef way.

Mike