From 11a3a8ae795412f009d88ab7ec3bc10494a1a849 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 3 Aug 2016 14:20:38 -0700 Subject: [PATCH] Fix GnuTLS includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * src/gnutls.c [HAVE_GNUTLS]: Don’t include gnutls/gnutls.h a second time; although it doesn’t hurt, it’s not needed. * src/sysdep.c [!HAVE_GNUTLS]: Don’t include gnutls/crypto.h, as it may not be available. Problem reported by Glenn Morris in: http://lists.gnu.org/archive/html/emacs-devel/2016-08/msg00100.html --- src/gnutls.c | 1 - src/sysdep.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gnutls.c b/src/gnutls.c index d242919..af2ba52 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -26,7 +26,6 @@ along with GNU Emacs. If not, see . */ #include "coding.h" #ifdef HAVE_GNUTLS -#include #ifdef WINDOWSNT #include diff --git a/src/sysdep.c b/src/sysdep.c index 43ff0a1..70cb961 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -95,7 +95,7 @@ along with GNU Emacs. If not, see . */ #include "gnutls.h" /* MS-Windows loads GnuTLS at run time, if available; we don't want to do that during startup just to call gnutls_rnd. */ -#ifndef WINDOWSNT +#if defined HAVE_GNUTLS && !defined WINDOWSNT # include #else # define emacs_gnutls_global_init() Qnil -- 2.5.5