Fix recent gnutls changes.

* gnutls.c (Fgnutls_boot): Don't assume C99.
* process.c (wait_reading_process_output): Fix typo in recent change.

3 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d0bdc6bee94..bd5688d868f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+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)
diff --git a/src/gnutls.c b/src/gnutls.c
index 5241c91f9cb..82b2fc8baa4 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -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);
diff --git a/src/process.c b/src/process.c
index ec4cda77e1c..c0c522a1403 100644
--- a/src/process.c
+++ b/src/process.c
@@ -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))