Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

signal.h is not supposed to define errno, so use ___errno instead.

Browse Source 
Adjust errno.h in a compatible fashion to avoid -Wredundant-decls issues.
I have run a build to check the tree for places where errno.h is missing,
and fixed the cases I found, but there might be more in MD code.
This commit is contained in:
dholland 2008-02-24 23:01:19 +00:00
parent 972b0b15b4
commit 933ac46844
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/errno.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: errno.h,v 1.9 2005/12/24 19:16:02 perry Exp $ */
/* $NetBSD: errno.h,v 1.10 2008/02/24 23:01:19 dholland Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -44,8 +44,13 @@
#include <sys/featuretest.h>
__BEGIN_DECLS
#ifndef errno
#ifndef __errno
int *__errno(void);
#define __errno __errno
#endif
#ifndef errno
#define errno (*__errno())
#endif

20
include/signal.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: signal.h,v 1.48 2006/01/07 20:10:29 kleink Exp $ */
/* $NetBSD: signal.h,v 1.49 2008/02/24 23:01:19 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -88,18 +88,26 @@ int sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict)
int sigsuspend(const sigset_t *) __RENAME(__sigsuspend14);
#if (defined(__GNUC__) && defined(__STDC__)) || defined(_SIGINLINE)
#ifndef errno
#ifndef __errno
int *__errno(void);
#define errno (*__errno())
#define __errno __errno
#endif
/* the same as "errno" - but signal.h is not allowed to define that */
#ifndef ___errno
#define ___errno (*__errno())
#endif
#ifndef _SIGINLINE
#define _SIGINLINE extern __inline
#endif
_SIGINLINE int
sigaddset(sigset_t *set, int signo)
{
if (signo <= 0 || signo >= _NSIG) {
errno = 22; /* EINVAL */
___errno = 22; /* EINVAL */
return (-1);
}
__sigaddset(set, signo);
@ -110,7 +118,7 @@ _SIGINLINE int
sigdelset(sigset_t *set, int signo)
{
if (signo <= 0 || signo >= _NSIG) {
errno = 22; /* EINVAL */
___errno = 22; /* EINVAL */
return (-1);
}
__sigdelset(set, signo);
@ -121,7 +129,7 @@ _SIGINLINE int
sigismember(const sigset_t *set, int signo)
{
if (signo <= 0 || signo >= _NSIG) {
errno = 22; /* EINVAL */
___errno = 22; /* EINVAL */
return (-1);
}
return (__sigismember(set, signo));