diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-28 22:31:12 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-28 22:31:12 -0700 |
| commit | 18ab493650d648ab8dca651ea2698861f926e895 (patch) | |
| tree | b16ca478db1e96af8d0be9a20ff1361bea6d12ee /src/callproc.c | |
| parent | 726e0ab18e84ce0df6b9dc1612bf4d92b9d1e52a (diff) | |
| parent | 43dc9f5b0187276c24e1f63f2a23ba4b81c20e07 (diff) | |
| download | emacs-18ab493650d648ab8dca651ea2698861f926e895.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/callproc.c b/src/callproc.c index 13d1232a346..993d943e158 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -603,6 +603,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) /* vfork, and prevent local vars from being clobbered by the vfork. */ { + int volatile fd1_volatile = fd1; int volatile fd_error_volatile = fd_error; int volatile fd_output_volatile = fd_output; int volatile output_to_buffer_volatile = output_to_buffer; @@ -610,6 +611,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) pid = vfork (); + fd1 = fd1_volatile; fd_error = fd_error_volatile; fd_output = fd_output_volatile; output_to_buffer = output_to_buffer_volatile; |