diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2009-01-29 19:23:24 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2009-01-29 19:23:24 +0000 |
| commit | c279587b96fd9f51477ea5648f9130981c59b11d (patch) | |
| tree | b853903469a19e882451097721d6008276a4ab72 /src | |
| parent | 5c7043a24839398e73bf783fdb430cd266083dee (diff) | |
| download | emacs-c279587b96fd9f51477ea5648f9130981c59b11d.tar.gz | |
Rename pending_signals to msdos_pending_signals.
(sig_suspender, sigprocmask): Adjust.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/msdos.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3eba52782f6..9ee1761b7d2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-01-29 Eli Zaretskii <eliz@gnu.org> + + * msdos.c: Rename pending_signals to msdos_pending_signals. + (sig_suspender, sigprocmask): Adjust. + 2009-01-29 Chong Yidong <cyd@stupidchicken.com> * keyboard.c (pending_signals): New var. diff --git a/src/msdos.c b/src/msdos.c index deaa35215ec..e4e57646991 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -4940,7 +4940,7 @@ static int sigprocmask_count = -1; static sigset_t current_mask; /* Which signals are pending (initially none). */ -static sigset_t pending_signals; +static sigset_t msdos_pending_signals; /* Previous handlers to restore when the blocked signals are unblocked. */ typedef void (*sighandler_t)(int); @@ -4952,7 +4952,7 @@ static void sig_suspender (signo) int signo; { - sigaddset (&pending_signals, signo); + sigaddset (&msdos_pending_signals, signo); } int @@ -4968,7 +4968,7 @@ sigprocmask (how, new_set, old_set) if (sigprocmask_count != __bss_count) { sigprocmask_count = __bss_count; - sigemptyset (&pending_signals); + sigemptyset (&msdos_pending_signals); sigemptyset (¤t_mask); for (signo = 0; signo < 320; signo++) prev_handlers[signo] = SIG_ERR; @@ -5014,9 +5014,9 @@ sigprocmask (how, new_set, old_set) signal (signo, prev_handlers[signo]); prev_handlers[signo] = SIG_ERR; } - if (sigismember (&pending_signals, signo)) + if (sigismember (&msdos_pending_signals, signo)) { - sigdelset (&pending_signals, signo); + sigdelset (&msdos_pending_signals, signo); raise (signo); } } |