diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-05-18 05:13:07 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-05-18 05:13:07 +0000 |
| commit | f73cdd5b6e3e0435dd8bd5d488a888753e03c3f9 (patch) | |
| tree | fa2c883f5c18fa093410ebdafd4042c5f30b5995 /cpukit | |
| parent | * tools/build/.cvsignore, tools/build/ChangeLog, (diff) | |
| download | rtems-f73cdd5b6e3e0435dd8bd5d488a888753e03c3f9.tar.bz2 | |
2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/sys/signalvar.h: Cosmetics from FreeBSD.
Comment out psignal().
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libnetworking/sys/signalvar.h | 14 |
2 files changed, 15 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ad0cd929ad..24f334d8de 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org> + + * libnetworking/sys/signalvar.h: Cosmetics from FreeBSD. + Comment out psignal(). + 2011-05-17 Joel Sherrill <joel.sherrill@oarcorp.com> * score/Makefile.am, score/preinstall.am: bspsmp.h is now supposed to @@ -19,6 +24,7 @@ score/src/schedulersimplesmpschedule.c, score/src/schedulersimplesmpunblock.c: New files. +>>>>>>> 1.2833 2011-05-16 Ralf Corsépius <ralf.corsepius@rtems.org> * libnetworking/Makefile.am: Reformat. diff --git a/cpukit/libnetworking/sys/signalvar.h b/cpukit/libnetworking/sys/signalvar.h index 83c9b4dc96..ee6743cd20 100644 --- a/cpukit/libnetworking/sys/signalvar.h +++ b/cpukit/libnetworking/sys/signalvar.h @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -31,10 +27,14 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.6 (Berkeley) 2/19/95 + * $FreeBSD: src/sys/sys/signalvar.h,v 1.91 2010/07/08 19:15:26 jhb Exp $ + */ + +/* * $Id$ */ -#ifndef _SYS_SIGNALVAR_H_ /* tmp for user.h */ +#ifndef _SYS_SIGNALVAR_H_ #define _SYS_SIGNALVAR_H_ /* @@ -161,7 +161,10 @@ int issignal(struct proc *p); void killproc(struct proc *p, char *why); void pgsignal(struct pgrp *pgrp, int sig, int checkctty); void postsig(int sig); +#ifndef __rtems__ +/* clashes with psignal(3) */ void psignal(struct proc *p, int sig); +#endif void setsigvec(struct proc *p, int signum, struct sigaction *sa); void sigexit(struct proc *p, int signum); void siginit(struct proc *p); @@ -172,4 +175,5 @@ void trapsignal(struct proc *p, int sig, u_long code); */ void sendsig(sig_t action, int sig, int returnmask, u_long code); #endif /* _KERNEL */ + #endif /* !_SYS_SIGNALVAR_H_ */ |