From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#19231: 25.0.50; [PATCH] Fix recent GnuTLS change for MinGW-w64 Date: Mon, 01 Dec 2014 18:46:48 +0100 Message-ID: References: <20141201.031748.1767411492928916984.chriszheng99@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417456107 7173 80.91.229.3 (1 Dec 2014 17:48:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Dec 2014 17:48:27 +0000 (UTC) Cc: 19231@debbugs.gnu.org To: Chris Zheng Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Dec 01 18:48:18 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1XvV58-0008Qf-Bm for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Dec 2014 18:48:18 +0100 Original-Received: from localhost ([::1]:32992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvV58-0002tq-1a for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Dec 2014 12:48:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvV4y-0002tH-NV for bug-gnu-emacs@gnu.org; Mon, 01 Dec 2014 12:48:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XvV4s-00026M-7v for bug-gnu-emacs@gnu.org; Mon, 01 Dec 2014 12:48:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:53797) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvV4s-00026I-5l for bug-gnu-emacs@gnu.org; Mon, 01 Dec 2014 12:48:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XvV4r-0004jG-Uz for bug-gnu-emacs@gnu.org; Mon, 01 Dec 2014 12:48:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Magne Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 01 Dec 2014 17:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19231 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 19231-submit@debbugs.gnu.org id=B19231.141745603018108 (code B ref 19231); Mon, 01 Dec 2014 17:48:01 +0000 Original-Received: (at 19231) by debbugs.gnu.org; 1 Dec 2014 17:47:10 +0000 Original-Received: from localhost ([127.0.0.1]:51010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XvV42-0004i0-3Y for submit@debbugs.gnu.org; Mon, 01 Dec 2014 12:47:10 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:57555) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XvV3z-0004hp-HA for 19231@debbugs.gnu.org; Mon, 01 Dec 2014 12:47:07 -0500 Original-Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1XvV3h-0000oL-5n; Mon, 01 Dec 2014 18:46:49 +0100 X-Now-Playing: Steely Dan's _Aja_: "Aja" X-Hashcash: 1:23:141201:chriszheng99@gmail.com::6B55XhSXjM9nfnVt:0000000000000000000000000000000000000009eZt X-Hashcash: 1:23:141201:19231@debbugs.gnu.org::3IDLx0OLohKrs+DS:0000000000000000000000000000000000000001DIT2 In-Reply-To: <20141201.031748.1767411492928916984.chriszheng99@gmail.com> (Chris Zheng's message of "Mon, 01 Dec 2014 03:17:48 +0800") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-MailScanner-ID: 1XvV3h-0000oL-5n MailScanner-NULL-Check: 1418060809.41799@A077kzf75UR9wclICr6Ocw X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:96783 Archived-At: Chris Zheng writes: > * src/gnutls.c: In MinGW-w64, `gnutls_sign_algorithm_get_name' is > defined as a macro to `gnutls_sign_get_name', so use > `gnutls_sign_get_name' directly. > (init_gnutls_functions): Load missing `gnutls_server_name_set'. > (init_gnutls_functions): Use `gnutls_sign_get_name'. > (gnutls_certificate_details): Use `fn_gnutls_sign_get_name'. [...] > +/* Use `gnutls_sign_get_name' instead of > + `gnutls_sign_algorithm_get_name' for MinGW-w64. */ > +#if defined(MINGW_W64) && defined(gnutls_sign_algorithm_get_name) > + const char *name = fn_gnutls_sign_get_name (err); > +#else > const char *name = fn_gnutls_sign_algorithm_get_name (err); > +#endif Instead of adding these ifdefs, perhaps we could just call fn_gnutls_sign_get_name on all platforms? Or does that function not exist on non-MingGW platforms? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no