[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 967e2ef: Fix GnuTLS includes
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 967e2ef: Fix GnuTLS includes |
Date: |
Wed, 3 Aug 2016 21:21:24 +0000 (UTC) |
branch: master
commit 967e2ef61dab8d2046f3285eefa71f3dcb9d9b60
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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
---
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
<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 43ff0a1..70cb961 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 967e2ef: Fix GnuTLS includes,
Paul Eggert <=