summaryrefslogtreecommitdiff
path: root/libc/signal
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-02-13 09:47:04 +0000
committerEric Andersen <andersen@codepoet.org>2002-02-13 09:47:04 +0000
commit3ab0557e5a3a81b5202334142326dd2e5edc5d28 (patch)
treefbc4cb8ae1dd73c49fdf4f898d0fb329e8551164 /libc/signal
parent80e6061ac5deca193759b979d34906bfc9b857ef (diff)
A number of naming updates in preparation for adding in
proper threading. Most of this is from Stefan Soucek, with additions and changes as needed from me.
Diffstat (limited to 'libc/signal')
-rw-r--r--libc/signal/sigaction.c8
-rw-r--r--libc/signal/sigset.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/libc/signal/sigaction.c b/libc/signal/sigaction.c
index cf58edf39..80cd68798 100644
--- a/libc/signal/sigaction.c
+++ b/libc/signal/sigaction.c
@@ -119,7 +119,7 @@ extern int __rt_sigaction (int, const struct kernel_sigaction *__unbounded,
/* If ACT is not NULL, change the action for SIG to *ACT.
If OACT is not NULL, put the old action for SIG in *OACT. */
-int sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
{
int result;
struct kernel_sigaction kact, koact;
@@ -148,7 +148,7 @@ int sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
}
return result;
}
-
+weak_alias(__libc_sigaction, sigaction)
@@ -160,7 +160,7 @@ extern int __sigaction (int, const struct old_kernel_sigaction *__unbounded,
/* If ACT is not NULL, change the action for SIG to *ACT.
If OACT is not NULL, put the old action for SIG in *OACT. */
-int sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
{
struct old_kernel_sigaction k_sigact, k_osigact;
int result;
@@ -187,4 +187,6 @@ int sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
return result;
}
+weak_alias(__libc_sigaction, sigaction)
+
#endif
diff --git a/libc/signal/sigset.c b/libc/signal/sigset.c
index a5afa17f3..e0cda7b9f 100644
--- a/libc/signal/sigset.c
+++ b/libc/signal/sigset.c
@@ -41,7 +41,7 @@ __sighandler_t sigset (int sig, __sighandler_t disp)
return SIG_ERR;
/* Add the signal set to the current signal mask. */
- if (__sigprocmask (SIG_BLOCK, &set, NULL) < 0)
+ if (sigprocmask (SIG_BLOCK, &set, NULL) < 0)
return SIG_ERR;
return SIG_HOLD;