diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /src/callproc.c | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c index 745d58c45f4..f0aa8222342 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -84,7 +84,7 @@ static int synch_process_fd; | |||
| 84 | 84 | ||
| 85 | /* Block SIGCHLD. */ | 85 | /* Block SIGCHLD. */ |
| 86 | 86 | ||
| 87 | static void | 87 | void |
| 88 | block_child_signal (void) | 88 | block_child_signal (void) |
| 89 | { | 89 | { |
| 90 | sigset_t blocked; | 90 | sigset_t blocked; |
| @@ -95,7 +95,7 @@ block_child_signal (void) | |||
| 95 | 95 | ||
| 96 | /* Unblock SIGCHLD. */ | 96 | /* Unblock SIGCHLD. */ |
| 97 | 97 | ||
| 98 | static void | 98 | void |
| 99 | unblock_child_signal (void) | 99 | unblock_child_signal (void) |
| 100 | { | 100 | { |
| 101 | pthread_sigmask (SIG_SETMASK, &empty_mask, 0); | 101 | pthread_sigmask (SIG_SETMASK, &empty_mask, 0); |