aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2009-01-29 19:23:24 +0000
committerEli Zaretskii2009-01-29 19:23:24 +0000
commitc279587b96fd9f51477ea5648f9130981c59b11d (patch)
treeb853903469a19e882451097721d6008276a4ab72 /src
parent5c7043a24839398e73bf783fdb430cd266083dee (diff)
downloademacs-c279587b96fd9f51477ea5648f9130981c59b11d.tar.gz
emacs-c279587b96fd9f51477ea5648f9130981c59b11d.zip
Rename pending_signals to msdos_pending_signals.
(sig_suspender, sigprocmask): Adjust.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/msdos.c10
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 @@
12009-01-29 Eli Zaretskii <eliz@gnu.org>
2
3 * msdos.c: Rename pending_signals to msdos_pending_signals.
4 (sig_suspender, sigprocmask): Adjust.
5
12009-01-29 Chong Yidong <cyd@stupidchicken.com> 62009-01-29 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * keyboard.c (pending_signals): New var. 8 * 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;
4940static sigset_t current_mask; 4940static sigset_t current_mask;
4941 4941
4942/* Which signals are pending (initially none). */ 4942/* Which signals are pending (initially none). */
4943static sigset_t pending_signals; 4943static sigset_t msdos_pending_signals;
4944 4944
4945/* Previous handlers to restore when the blocked signals are unblocked. */ 4945/* Previous handlers to restore when the blocked signals are unblocked. */
4946typedef void (*sighandler_t)(int); 4946typedef void (*sighandler_t)(int);
@@ -4952,7 +4952,7 @@ static void
4952sig_suspender (signo) 4952sig_suspender (signo)
4953 int signo; 4953 int signo;
4954{ 4954{
4955 sigaddset (&pending_signals, signo); 4955 sigaddset (&msdos_pending_signals, signo);
4956} 4956}
4957 4957
4958int 4958int
@@ -4968,7 +4968,7 @@ sigprocmask (how, new_set, old_set)
4968 if (sigprocmask_count != __bss_count) 4968 if (sigprocmask_count != __bss_count)
4969 { 4969 {
4970 sigprocmask_count = __bss_count; 4970 sigprocmask_count = __bss_count;
4971 sigemptyset (&pending_signals); 4971 sigemptyset (&msdos_pending_signals);
4972 sigemptyset (&current_mask); 4972 sigemptyset (&current_mask);
4973 for (signo = 0; signo < 320; signo++) 4973 for (signo = 0; signo < 320; signo++)
4974 prev_handlers[signo] = SIG_ERR; 4974 prev_handlers[signo] = SIG_ERR;
@@ -5014,9 +5014,9 @@ sigprocmask (how, new_set, old_set)
5014 signal (signo, prev_handlers[signo]); 5014 signal (signo, prev_handlers[signo]);
5015 prev_handlers[signo] = SIG_ERR; 5015 prev_handlers[signo] = SIG_ERR;
5016 } 5016 }
5017 if (sigismember (&pending_signals, signo)) 5017 if (sigismember (&msdos_pending_signals, signo))
5018 { 5018 {
5019 sigdelset (&pending_signals, signo); 5019 sigdelset (&msdos_pending_signals, signo);
5020 raise (signo); 5020 raise (signo);
5021 } 5021 }
5022 } 5022 }