From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 15 Jul 2017 11:03:44 +0000 (+0300)
Subject: Fix compilation of gnutls.c with older GnuTLS
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~1543^2~97
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=178e0df2c283fa00f0aa8df0e321b846d3d8d47f;p=emacs.git

Fix compilation of gnutls.c with older GnuTLS

* src/gnutrls.c (syms_of_gnutls): Condition some defsubr's
on HAVE_GNUTLS3, to avoid compilation errors when GnuTLS
v3.X is not available.  Reported by Colin Baxter <m43cap@yandex.com>.
---

diff --git a/src/gnutls.c b/src/gnutls.c
index 0fc5d90c3ac..7dff0a4cddc 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -2518,6 +2518,7 @@ syms_of_gnutls (void)
   defsubr (&Sgnutls_peer_status);
   defsubr (&Sgnutls_peer_status_warning_describe);
 
+#ifdef HAVE_GNUTLS3
   defsubr (&Sgnutls_ciphers);
   defsubr (&Sgnutls_macs);
   defsubr (&Sgnutls_digests);
@@ -2525,6 +2526,7 @@ syms_of_gnutls (void)
   defsubr (&Sgnutls_hash_digest);
   defsubr (&Sgnutls_symmetric_encrypt);
   defsubr (&Sgnutls_symmetric_decrypt);
+#endif
 
   DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level,
 	      doc: /* Logging level used by the GnuTLS functions.