diff options
author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-06-18 07:24:22 +0000 |
---|---|---|
committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2001-06-18 07:24:22 +0000 |
commit | 3c7f60d08479cf4f8da842c3305f8deeedef8031 (patch) | |
tree | 5875327200bdbe70fb9921e31ec76aeed8d424c9 | |
parent | ad740ebdd1a4faec3a9a8d65772c87345648fbf8 (diff) | |
download | zsh-3c7f60d08479cf4f8da842c3305f8deeedef8031.tar.gz zsh-3c7f60d08479cf4f8da842c3305f8deeedef8031.tar.xz zsh-3c7f60d08479cf4f8da842c3305f8deeedef8031.zip |
rename handler() to zhandler() because it's now exported to modules (14951)
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Src/signals.c | 4 | ||||
-rw-r--r-- | Src/signals.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 4e0997369..1ded9cb6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-06-18 Sven Wischnowsky <wischnow@zsh.org> + + * 14951: Src/signals.c, Src/signals.h: rename handler() to + zhandler() because it's now exported to modules + 2001-06-17 Bart Schaefer <schaefer@zsh.org> * Jason Began: 3931 (see cvs.netbsd.org): src/zshconfig.ac: Use diff --git a/Src/signals.c b/Src/signals.c index 649d78b73..e67887170 100644 --- a/Src/signals.c +++ b/Src/signals.c @@ -93,7 +93,7 @@ install_handler(int sig) #ifdef POSIX_SIGNALS struct sigaction act; - act.sa_handler = (SIGNAL_HANDTYPE) handler; + act.sa_handler = (SIGNAL_HANDTYPE) zhandler; sigemptyset(&act.sa_mask); /* only block sig while in handler */ act.sa_flags = 0; # ifdef SA_INTERRUPT /* SunOS 4.x */ @@ -401,7 +401,7 @@ signal_suspend(int sig, int sig2) /**/ mod_export RETSIGTYPE -handler(int sig) +zhandler(int sig) { sigset_t newmask, oldmask; diff --git a/Src/signals.h b/Src/signals.h index 4ac19aa3e..4b8197d84 100644 --- a/Src/signals.h +++ b/Src/signals.h @@ -82,7 +82,7 @@ sigset_t oset; \ queue_front = (queue_front + 1) % MAX_QUEUE_SIZE; \ oset = signal_setmask(signal_mask_queue[queue_front]); \ - handler(signal_queue[queue_front]); /* handle queued signal */ \ + zhandler(signal_queue[queue_front]); /* handle queued signal */ \ signal_setmask(oset); \ } \ } while (0) |