diff options
| author | Paul Eggert | 2016-08-03 14:20:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-08-03 14:21:21 -0700 |
| commit | 967e2ef61dab8d2046f3285eefa71f3dcb9d9b60 (patch) | |
| tree | a39a9cd6d0d5fc2b95226b58ad786e14cda76595 /src/sysdep.c | |
| parent | 9a68740d9650d2825094296b737a73f158f664ab (diff) | |
| download | emacs-967e2ef61dab8d2046f3285eefa71f3dcb9d9b60.tar.gz emacs-967e2ef61dab8d2046f3285eefa71f3dcb9d9b60.zip | |
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
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
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/>. */ | |||
| 95 | #include "gnutls.h" | 95 | #include "gnutls.h" |
| 96 | /* MS-Windows loads GnuTLS at run time, if available; we don't want to | 96 | /* MS-Windows loads GnuTLS at run time, if available; we don't want to |
| 97 | do that during startup just to call gnutls_rnd. */ | 97 | do that during startup just to call gnutls_rnd. */ |
| 98 | #ifndef WINDOWSNT | 98 | #if defined HAVE_GNUTLS && !defined WINDOWSNT |
| 99 | # include <gnutls/crypto.h> | 99 | # include <gnutls/crypto.h> |
| 100 | #else | 100 | #else |
| 101 | # define emacs_gnutls_global_init() Qnil | 101 | # define emacs_gnutls_global_init() Qnil |