Commit 69369809 authored by Paul Eggert's avatar Paul Eggert
Browse files

Fix recent gnutls changes.

* gnutls.c (Fgnutls_boot): Don't assume C99.
* process.c (wait_reading_process_output): Fix typo in recent change.
parent 2d748773
2013-11-05 Paul Eggert <eggert@cs.ucla.edu>
Fix recent gnutls changes.
* gnutls.c (Fgnutls_boot): Don't assume C99.
* process.c (wait_reading_process_output): Fix typo in recent change.
2013-11-05 Teodor Zlatanov <tzz@lifelogs.com>
* process.c (wait_reading_process_output, read_process_output)
......
......@@ -1103,7 +1103,7 @@ one trustfile (usually a CA bundle). */)
fn_gnutls_x509_crt_deinit (gnutls_verify_cert);
}
// Only set this flag if the whole initialization succeeded.
/* Set this flag only if the whole initialization succeeded. */
XPROCESS (proc)->gnutls_p = 1;
return gnutls_make_error (ret);
......
......@@ -4623,7 +4623,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
{
/* Check this specific channel. */
if (wait_proc->gnutls_p /* Check for valid process. */
&& p->gnutls_state
&& wait_proc->gnutls_state
/* Do we have pending data? */
&& ((emacs_gnutls_record_check_pending
(wait_proc->gnutls_state))
......
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