Commit 967e2ef6 authored by Paul Eggert's avatar Paul Eggert
Browse files

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
parent 9a68740d
...@@ -26,7 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -26,7 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "coding.h" #include "coding.h"
#ifdef HAVE_GNUTLS #ifdef HAVE_GNUTLS
#include <gnutls/gnutls.h>
#ifdef WINDOWSNT #ifdef WINDOWSNT
#include <windows.h> #include <windows.h>
......
...@@ -95,7 +95,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -95,7 +95,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "gnutls.h" #include "gnutls.h"
/* MS-Windows loads GnuTLS at run time, if available; we don't want to /* MS-Windows loads GnuTLS at run time, if available; we don't want to
do that during startup just to call gnutls_rnd. */ do that during startup just to call gnutls_rnd. */
#ifndef WINDOWSNT #if defined HAVE_GNUTLS && !defined WINDOWSNT
# include <gnutls/crypto.h> # include <gnutls/crypto.h>
#else #else
# define emacs_gnutls_global_init() Qnil # define emacs_gnutls_global_init() Qnil
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment