procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A better fix for bug#19346

Browse source 
src/gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move
 gnutls-available-p out of the HAVE_GNUTLS conditional, and define
 them only once.
This commit is contained in:
Eli Zaretskii 2014-12-12 11:19:59 +02:00
parent 82ec808f0a
commit 16d4c1cdc8
2 changed files with 17 additions and 18 deletions

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-12-12 Eli Zaretskii <eliz@gnu.org>
* gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move
gnutls-available-p out of the HAVE_GNUTLS conditional, and define
them only once.
2014-12-11 Teodor Zlatanov <tzz@lifelogs.com> 2014-12-11 Teodor Zlatanov <tzz@lifelogs.com>
* emacs.c (main): Always include gnutls.h and run syms_of_gnutls. * emacs.c (main): Always include gnutls.h and run syms_of_gnutls.

29
src/gnutls.c
View file

@ -1158,11 +1158,14 @@ This function may also return `gnutls-e-again', or
return gnutls_make_error (ret); return gnutls_make_error (ret);
} }
#endif /* HAVE_GNUTLS */
DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
doc: /* Return t if GnuTLS is available in this instance of Emacs. */) doc: /* Return t if GnuTLS is available in this instance of Emacs. */)
(void) (void)
{ {
#ifdef WINDOWSNT #ifdef HAVE_GNUTLS
# ifdef WINDOWSNT
Lisp_Object found = Fassq (Qgnutls_dll, Vlibrary_cache); Lisp_Object found = Fassq (Qgnutls_dll, Vlibrary_cache);
if (CONSP (found)) if (CONSP (found))
return XCDR (found); return XCDR (found);
@ -1173,14 +1176,18 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache); Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache);
return status; return status;
} }
#else # else /* !WINDOWSNT */
return Qt; return Qt;
#endif # endif /* !WINDOWSNT */
#else /* !HAVE_GNUTLS */
return Qnil;
#endif /* !HAVE_GNUTLS */
} }
void void
syms_of_gnutls (void) syms_of_gnutls (void)
{ {
#ifdef HAVE_GNUTLS
gnutls_global_initialized = 0; gnutls_global_initialized = 0;
DEFSYM (Qgnutls_dll, "gnutls"); DEFSYM (Qgnutls_dll, "gnutls");
@ -1222,7 +1229,6 @@ syms_of_gnutls (void)
defsubr (&Sgnutls_boot); defsubr (&Sgnutls_boot);
defsubr (&Sgnutls_deinit); defsubr (&Sgnutls_deinit);
defsubr (&Sgnutls_bye); defsubr (&Sgnutls_bye);
defsubr (&Sgnutls_available_p);
DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level, DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level,
doc: /* Logging level used by the GnuTLS functions. doc: /* Logging level used by the GnuTLS functions.
@ -1230,21 +1236,8 @@ Set this larger than 0 to get debug output in the *Messages* buffer.
1 is for important messages, 2 is for debug data, and higher numbers 1 is for important messages, 2 is for debug data, and higher numbers
are as per the GnuTLS logging conventions. */); are as per the GnuTLS logging conventions. */);
global_gnutls_log_level = 0; global_gnutls_log_level = 0;
}
#else #endif /* HAVE_GNUTLS */
DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0,
doc: /* Return t if GnuTLS is available in this instance of Emacs. */)
(void)
{
return Qnil;
}
void
syms_of_gnutls (void)
{
defsubr (&Sgnutls_available_p); defsubr (&Sgnutls_available_p);
} }
#endif /* HAVE_GNUTLS */