diff options
| author | Paul Eggert | 2011-07-28 09:27:30 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-28 09:27:30 -0700 |
| commit | 70c2e72ae5368e39277de78a414c9d42292886c5 (patch) | |
| tree | dc2f35bb271058a7dc728ef970da93db9a48b2ff /src/callproc.c | |
| parent | f13cae31f1beecc4f3fd39e4aa4bcb9fc8d9e7c1 (diff) | |
| parent | 58e9b49a90338bf979b86951b6d85e60308ecc3e (diff) | |
| download | emacs-70c2e72ae5368e39277de78a414c9d42292886c5.tar.gz emacs-70c2e72ae5368e39277de78a414c9d42292886c5.zip | |
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 ad3eddbdd39..f148f6233d4 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -603,6 +603,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 603 | 603 | ||
| 604 | /* vfork, and prevent local vars from being clobbered by the vfork. */ | 604 | /* vfork, and prevent local vars from being clobbered by the vfork. */ |
| 605 | { | 605 | { |
| 606 | int volatile fd1_volatile = fd1; | ||
| 606 | int volatile fd_error_volatile = fd_error; | 607 | int volatile fd_error_volatile = fd_error; |
| 607 | int volatile fd_output_volatile = fd_output; | 608 | int volatile fd_output_volatile = fd_output; |
| 608 | int volatile output_to_buffer_volatile = output_to_buffer; | 609 | int volatile output_to_buffer_volatile = output_to_buffer; |
| @@ -610,6 +611,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) | |||
| 610 | 611 | ||
| 611 | pid = vfork (); | 612 | pid = vfork (); |
| 612 | 613 | ||
| 614 | fd1 = fd1_volatile; | ||
| 613 | fd_error = fd_error_volatile; | 615 | fd_error = fd_error_volatile; |
| 614 | fd_output = fd_output_volatile; | 616 | fd_output = fd_output_volatile; |
| 615 | output_to_buffer = output_to_buffer_volatile; | 617 | output_to_buffer = output_to_buffer_volatile; |