JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix guard for siginfo_t and pthread_t definition

Browse Source 
Commit 8a3b3bb4d7224d419cc1a4af60ccf7e70edc876b changed the guard on
some functions from _POSIX_THREADS to __POSIX_VISIBLE. As a consequence,
some use of siginfo_t and pthread_t became visible under configurations
where _POSIX_THREADS is unset but __POSIX_VISIBLE is. Build then fails
because the definition of those types are still unavailable.

This commit make those type definition visible for __POSIX_VISIBLE
configurations. This requires moving the siginfo_t definition out of the
RTEMS specific definitions in sys/signal.h while still guarding it
against cygwin case.
This commit is contained in:
Thomas Preud'homme 2017-06-15 14:09:39 +01:00 committed by Corinna Vinschen
parent 14ea06212b
commit 0c081aa62c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newlib/libc/include/sys/_pthreadtypes.h
View File

@ -18,7 +18,7 @@
#ifndef _SYS__PTHREADTYPES_H_ #ifndef _SYS__PTHREADTYPES_H_
#define _SYS__PTHREADTYPES_H_ #define _SYS__PTHREADTYPES_H_
#if defined(_POSIX_THREADS) #if defined(_POSIX_THREADS) || __POSIX_VISIBLE >= 199506
#include <sys/sched.h> #include <sys/sched.h>
@ -195,7 +195,7 @@ typedef struct {
} pthread_once_t; /* dynamic package initialization */ } pthread_once_t; /* dynamic package initialization */
#define _PTHREAD_ONCE_INIT { 1, 0 } /* is initialized and not run */ #define _PTHREAD_ONCE_INIT { 1, 0 } /* is initialized and not run */
#endif /* defined(_POSIX_THREADS) */ #endif /* defined(_POSIX_THREADS) || __POSIX_VISIBLE >= 199506 */
/* POSIX Barrier Types */ /* POSIX Barrier Types */

16
newlib/libc/include/sys/signal.h
View File

@ -18,9 +18,11 @@ extern "C" {
typedef __sigset_t sigset_t; typedef __sigset_t sigset_t;
#endif #endif
#if defined(__rtems__) #if defined(__CYGWIN__)
#include <cygwin/signal.h>
#else
#if defined(_POSIX_REALTIME_SIGNALS) #if defined(_POSIX_REALTIME_SIGNALS) || __POSIX_VISIBLE >= 199309
/* sigev_notify values /* sigev_notify values
NOTE: P1003.1c/D10, p. 34 adds SIGEV_THREAD. */ NOTE: P1003.1c/D10, p. 34 adds SIGEV_THREAD. */
@ -68,7 +70,9 @@ typedef struct {
int si_code; /* Cause of the signal */ int si_code; /* Cause of the signal */
union sigval si_value; /* Signal value */ union sigval si_value; /* Signal value */
} siginfo_t; } siginfo_t;
#endif #endif /* defined(_POSIX_REALTIME_SIGNALS) || __POSIX_VISIBLE >= 199309 */
#if defined(__rtems__)
/* 3.3.8 Synchronously Accept a Signal, P1003.1b-1993, p. 76 */ /* 3.3.8 Synchronously Accept a Signal, P1003.1b-1993, p. 76 */
@ -108,9 +112,8 @@ struct sigaction {
#define sa_sigaction _signal_handlers._sigaction #define sa_sigaction _signal_handlers._sigaction
#endif #endif
#elif defined(__CYGWIN__) #else /* defined(__rtems__) */
#include <cygwin/signal.h>
#else
#define SA_NOCLDSTOP 1 /* only value supported now for sa_flags */ #define SA_NOCLDSTOP 1 /* only value supported now for sa_flags */
typedef void (*_sig_func_ptr)(int); typedef void (*_sig_func_ptr)(int);
@ -122,6 +125,7 @@ struct sigaction
int sa_flags; int sa_flags;
}; };
#endif /* defined(__rtems__) */ #endif /* defined(__rtems__) */
#endif /* defined(__CYGWIN__) */
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809 #if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
/* /*