From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 3 Aug 2016 21:20:38 +0000 (-0700)
Subject: Fix GnuTLS includes
X-Git-Tag: emacs-26.0.90~1805
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=967e2ef61dab8d2046f3285eefa71f3dcb9d9b60;p=emacs.git

Fix GnuTLS includes

* 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
---

diff --git a/src/gnutls.c b/src/gnutls.c
index d242919270b..af2ba52870c 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -26,7 +26,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "coding.h"
 
 #ifdef HAVE_GNUTLS
-#include <gnutls/gnutls.h>
 
 #ifdef WINDOWSNT
 #include <windows.h>
diff --git a/src/sysdep.c b/src/sysdep.c
index 43ff0a1e496..70cb961e21f 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -95,7 +95,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 <gnutls/crypto.h>
 #else
 # define emacs_gnutls_global_init() Qnil