diff options
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/aio_sigqueue.c | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/sigaction.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/siginfo.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/init-first.c | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigqueue.c | 9 |
5 files changed, 9 insertions, 22 deletions
diff --git a/sysdeps/unix/sysv/linux/aio_sigqueue.c b/sysdeps/unix/sysv/linux/aio_sigqueue.c index 1520ee1a29..fc1187b443 100644 --- a/sysdeps/unix/sysv/linux/aio_sigqueue.c +++ b/sysdeps/unix/sysv/linux/aio_sigqueue.c @@ -41,13 +41,10 @@ __aio_sigqueue (sig, val) info.si_errno = 0; info.si_code = SI_ASYNCIO; - if (__libc_pid ==0xf00baa) - __libc_pid = __getpid (); - info.si_pid = __libc_pid; - + info.si_pid = getpid (); info.si_uid = getuid (); info.si_value = val; - return __syscall_rt_sigqueueinfo (__libc_pid, sig, &info); + return __syscall_rt_sigqueueinfo (info.si_pid, sig, &info); } diff --git a/sysdeps/unix/sysv/linux/bits/sigaction.h b/sysdeps/unix/sysv/linux/bits/sigaction.h index b6637e5205..523084bcf3 100644 --- a/sysdeps/unix/sysv/linux/bits/sigaction.h +++ b/sysdeps/unix/sysv/linux/bits/sigaction.h @@ -1,5 +1,5 @@ /* The proper definitions for Linux's sigaction. - Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ struct sigaction /* Used if SA_SIGINFO is not set. */ __sighandler_t sa_handler; /* Used if SA_SIGINFO is set. */ - void (*sa_sigaction) __P ((int, siginfo_t *, void *)); + void (*sa_sigaction) __PMT ((int, siginfo_t *, void *)); } __sigaction_handler; #define sa_handler __sigaction_handler.sa_handler @@ -43,7 +43,7 @@ struct sigaction int sa_flags; /* Restore handler. */ - void (*sa_restorer) __P ((void)); + void (*sa_restorer) __PMT ((void)); }; /* Bits in `sa_flags'. */ diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h b/sysdeps/unix/sysv/linux/bits/siginfo.h index 503465b3bf..0a346181c9 100644 --- a/sysdeps/unix/sysv/linux/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/bits/siginfo.h @@ -1,5 +1,5 @@ /* siginfo_t, sigevent and constants. Linux version. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -252,8 +252,8 @@ typedef struct sigevent struct { - void (*_function) __P ((sigval_t)); /* Function to start. */ - void *_attribute; /* Really pthread_attr_t. */ + void (*_function) __PMT ((sigval_t)); /* Function to start. */ + void *_attribute; /* Really pthread_attr_t. */ } _sigev_thread; } _sigev_un; } sigevent_t; diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index c6bf6fb1a4..0931e99113 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -43,9 +43,6 @@ int __libc_multiple_libcs = 1; int __libc_argc; char **__libc_argv; -/* We often need the UID and PID. Cache these values. */ -pid_t __libc_pid = 0xf00baa; - static void init (int argc, char **argv, char **envp) diff --git a/sysdeps/unix/sysv/linux/sigqueue.c b/sysdeps/unix/sysv/linux/sigqueue.c index 495238660d..5719e2497b 100644 --- a/sysdeps/unix/sysv/linux/sigqueue.c +++ b/sysdeps/unix/sysv/linux/sigqueue.c @@ -21,9 +21,6 @@ extern int __syscall_rt_sigqueueinfo (int, int, siginfo_t *); -/* These variables are used quite often in the libc code. */ -extern pid_t __libc_pid; - /* Return any pending signal or wait for one for the given time. */ int @@ -38,11 +35,7 @@ __sigqueue (pid, sig, val) info.si_signo = sig; info.si_errno = 0; info.si_code = SI_QUEUE; - - if (__libc_pid == 0xf00baa) - __libc_pid = __getpid (); - info.si_pid = __libc_pid; - + info.si_pid = __getpid (); info.si_uid = __getuid (); info.si_value = val; |