aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorJoakim Verona2012-01-23 15:10:06 +0100
committerJoakim Verona2012-01-23 15:10:06 +0100
commit0322b140eead7c94de7f0f6d19a90bd15690b4eb (patch)
tree950c011783cc896d0450084cb5155e54548bfe5b /src/process.c
parentd5114bfea3ea4c37c57e2af0f3b095be9fcd8bac (diff)
parentcb5850f27c1b4d26957d58e2da2314dd12498671 (diff)
downloademacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.tar.gz
emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.zip
upstream
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/process.c b/src/process.c
index 3dc753f5159..bdf16b7dbd2 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5060,9 +5060,8 @@ read_process_output (Lisp_Object proc, register int channel)
5060 proc_buffered_char[channel] = -1; 5060 proc_buffered_char[channel] = -1;
5061 } 5061 }
5062#ifdef HAVE_GNUTLS 5062#ifdef HAVE_GNUTLS
5063 if (XPROCESS (proc)->gnutls_p) 5063 if (p->gnutls_p)
5064 nbytes = emacs_gnutls_read (XPROCESS (proc), 5064 nbytes = emacs_gnutls_read (p, chars + carryover + buffered,
5065 chars + carryover + buffered,
5066 readmax - buffered); 5065 readmax - buffered);
5067 else 5066 else
5068#endif 5067#endif
@@ -5527,9 +5526,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
5527#endif 5526#endif
5528 { 5527 {
5529#ifdef HAVE_GNUTLS 5528#ifdef HAVE_GNUTLS
5530 if (XPROCESS (proc)->gnutls_p) 5529 if (p->gnutls_p)
5531 written = emacs_gnutls_write (XPROCESS (proc), 5530 written = emacs_gnutls_write (p, buf, this);
5532 buf, this);
5533 else 5531 else
5534#endif 5532#endif
5535 written = emacs_write (outfd, buf, this); 5533 written = emacs_write (outfd, buf, this);