From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andy Moreton Newsgroups: gmane.emacs.devel Subject: gnutls changes break Windows mingw64 build Date: Tue, 09 Dec 2014 15:06:40 +0000 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418137639 14746 80.91.229.3 (9 Dec 2014 15:07:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Dec 2014 15:07:19 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 09 16:07:12 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XyMNc-0002dE-Kv for ged-emacs-devel@m.gmane.org; Tue, 09 Dec 2014 16:07:12 +0100 Original-Received: from localhost ([::1]:40946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XyMNc-0002wi-4F for ged-emacs-devel@m.gmane.org; Tue, 09 Dec 2014 10:07:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XyMNR-0002wG-RO for emacs-devel@gnu.org; Tue, 09 Dec 2014 10:07:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XyMNK-0000u9-Bm for emacs-devel@gnu.org; Tue, 09 Dec 2014 10:07:01 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:45672) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XyMNK-0000tz-5f for emacs-devel@gnu.org; Tue, 09 Dec 2014 10:06:54 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XyMNI-0002Sn-61 for emacs-devel@gnu.org; Tue, 09 Dec 2014 16:06:52 +0100 Original-Received: from uk.solarflare.com ([193.34.186.16]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 09 Dec 2014 16:06:52 +0100 Original-Received: from andrewjmoreton by uk.solarflare.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 09 Dec 2014 16:06:52 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 21 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: uk.solarflare.com User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.51 (windows-nt) Cancel-Lock: sha1:OmfpnucWY+Vx3wDmE3X1nsxHmiM= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:179563 Archived-At: Hi, The changes in commit ad67503f50b8 ("Make gnutls-peer-status return even more data") broke the msys2 mingw64 build for me. The following trivial change fixed it: diff --git a/src/gnutls.c b/src/gnutls.c index 46ef21137fb6..aa800be25762 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -194,7 +194,7 @@ DEF_GNUTLS_FN (gnutls_kx_algorithm_t, gnutls_kx_get, (gnutls_session_t)); DEF_GNUTLS_FN (const char*, gnutls_kx_get_name, (gnutls_kx_algorithm_t)); DEF_GNUTLS_FN (gnutls_protocol_t, gnutls_protocol_get_version, (gnutls_session_t)); -DEF_GNUTLS_FN (const char*, gnutls_protocol_get_version, (gnutls_protocol_t)); +DEF_GNUTLS_FN (const char*, gnutls_protocol_get_name, (gnutls_protocol_t)); DEF_GNUTLS_FN (gnutls_cipher_algorithm_t, gnutls_cipher_get, (gnutls_session_t)); DEF_GNUTLS_FN (const char*, gnutls_cipher_get_name,