On Fri, 18 Nov 2016, Dan Fandrich wrote:

> I was accidentally testing that branch merged with HEAD. Compiling that
> branch on its own (commit 0fc003e0) gets past the line 143 problem but the
> other one remains. This is with GnuTLS 3.2.21
>
>
> CC vtls/libcurl_la-vtls.lo
> /home/dan/src/curl-git/lib/vtls/vtls.c:597:5: error: redefinition of 'Curl_ssl_getsock'
> int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
> ^

Still not a match with what github shows on line 597 in vtls.c!

  https://github.com/curl/curl/blob/HTTPS-proxy/lib/vtls/vtls.c#L597

-- 
  / daniel.haxx.se
-------------------------------------------------------------------
List admin: https://cool.haxx.se/list/listinfo/curl-library
Etiquette:  https://curl.haxx.se/mail/etiquette.html