* process.c (read_process_output): Use p instead of XPROCESS (proc).

(send_process): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index faaea40..925bb82 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-21  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * process.c (read_process_output): Use p instead of XPROCESS (proc).
+       (send_process): Likewise.
+
 2012-01-19  Martin Rudalics  <rudalics@gmx.at>
 
        * window.c (save_window_save, Fcurrent_window_configuration)

diff --git a/src/process.c b/src/process.c
index 3dc753f..bdf16b7 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -5060,9 +5060,8 @@ read_process_output (Lisp_Object proc, register int channel)
          proc_buffered_char[channel] = -1;
        }
 #ifdef HAVE_GNUTLS
-      if (XPROCESS (proc)->gnutls_p)
-       nbytes = emacs_gnutls_read (XPROCESS (proc),
-                                   chars + carryover + buffered,
+      if (p->gnutls_p)
+       nbytes = emacs_gnutls_read (p, chars + carryover + buffered,
                                    readmax - buffered);
       else
 #endif
@@ -5527,9 +5526,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
 #endif
                {
 #ifdef HAVE_GNUTLS
-                 if (XPROCESS (proc)->gnutls_p)
-                   written = emacs_gnutls_write (XPROCESS (proc),
-                                                  buf, this);
+                 if (p->gnutls_p)
+                   written = emacs_gnutls_write (p, buf, this);
                  else
 #endif
                    written = emacs_write (outfd, buf, this);