diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-03-15 15:53:55 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-03-15 15:53:55 +0000 |
| commit | 780a701d63b25431f31d77f0701f98bfe5ea2d94 (patch) | |
| tree | be2c2f5c557acee55c8ab41b6d3a87d8f84b3cbd /libc/signal | |
| parent | a6728b114d9c99b8515accb002474ea703a6705c (diff) | |
Merge changes between r7922 and r8107 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@8108 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/signal')
| -rw-r--r-- | libc/signal/signal.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/libc/signal/signal.h b/libc/signal/signal.h index aa210374d..67f8cb4d3 100644 --- a/libc/signal/signal.h +++ b/libc/signal/signal.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2003, 2004, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1991-2003, 2004, 2007, 2009 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 @@ -70,6 +70,15 @@ typedef __uid_t uid_t; # endif #endif /* Unix98 */ +#ifdef __USE_POSIX199309 +/* We need `struct timespec' later on. */ +# define __need_timespec +# include <time.h> + +/* Get the `siginfo_t' type plus the needed symbols. */ +# include <bits/siginfo.h> +#endif + /* Type of a signal handler. */ typedef void (*__sighandler_t) (int); @@ -136,10 +145,16 @@ extern __sighandler_t ssignal (int __sig, __sighandler_t __handler) extern int gsignal (int __sig) __THROW; #endif /* Use SVID. */ -#ifdef __USE_MISC +#if defined __USE_MISC || defined __USE_XOPEN2K /* Print a message describing the meaning of the given signal number. */ extern void psignal (int __sig, __const char *__s); -#endif /* Use misc. */ +#endif /* Use misc or POSIX 2008. */ + +#ifdef __USE_XOPEN2K +/* Print a message describing the meaning of the given signal information. */ +extern void psiginfo (__const siginfo_t *__pinfo, __const char *__s); +#endif /* POSIX 2008. */ + /* The `sigpause' function has two different interfaces. The original @@ -203,15 +218,6 @@ typedef __sighandler_t sig_t; #ifdef __USE_POSIX -# ifdef __USE_POSIX199309 -/* We need `struct timespec' later on. */ -# define __need_timespec -# include <time.h> - -/* Get the `siginfo_t' type plus the needed symbols. */ -# include <bits/siginfo.h> -# endif - /* Clear all signals from SET. */ extern int sigemptyset (sigset_t *__set) __THROW __nonnull ((1)); |