[Emacs-diffs] trunk r114959: Fix recent gnutls changes.

[Paul Eggert]

------------------------------------------------------------
revno: 114959
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-11-04 21:32:19 -0800
message:
  Fix recent gnutls changes.
  
  * gnutls.c (Fgnutls_boot): Don't assume C99.
  * process.c (wait_reading_process_output): Fix typo in recent change.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/gnutls.c                   gnutls.c-20100926054902-dzayyj6wycit6kzn-3
  src/process.c                  process.c-20091113204419-o5vbwnq5f7feedwu-462

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-05 02:29:03 +0000
+++ b/src/ChangeLog     2013-11-05 05:32:19 +0000
@@ -1,3 +1,9 @@
+2013-11-05  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * process.c (wait_reading_process_output, read_process_output)

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2013-11-05 02:29:03 +0000
+++ b/src/gnutls.c      2013-11-05 05:32:19 +0000
@@ -1103,7 +1103,7 @@
       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);

=== modified file 'src/process.c'
--- a/src/process.c     2013-11-05 02:29:03 +0000
+++ b/src/process.c     2013-11-05 05:32:19 +0000
@@ -4623,7 +4623,7 @@
                {
                  /* 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))