diff --git a/components/libc/pthreads/pthread.h b/components/libc/pthreads/pthread.h index 81af885981249f7c5979a4ff1faa75d7f66815ca..d79a065fe6a4e3e0f2683de341cc4aa56299e550 100644 --- a/components/libc/pthreads/pthread.h +++ b/components/libc/pthreads/pthread.h @@ -276,27 +276,6 @@ int pthread_barrier_init(pthread_barrier_t *barrier, int pthread_barrier_wait(pthread_barrier_t *barrier); -/* Signal Generation and Delivery, P1003.1b-1993, p. 63 - NOTE: P1003.1c/D10, p. 34 adds sigev_notify_function and - sigev_notify_attributes to the sigevent structure. */ -#if 0 -union sigval -{ - int sival_int; /* Integer signal value */ - void *sival_ptr; /* Pointer signal value */ -}; -#endif - -struct sigevent -{ - int sigev_notify; /* Notification type */ - int sigev_signo; /* Signal number */ - union sigval sigev_value; /* Signal value */ - void (*sigev_notify_function)( union sigval ); - /* Notification function */ - pthread_attr_t *sigev_notify_attributes; /* Notification Attributes */ -}; - /* posix clock and timer */ #define MILLISECOND_PER_SECOND 1000UL #define MICROSECOND_PER_SECOND 1000000UL diff --git a/components/libc/signal/posix_signal.h b/components/libc/signal/posix_signal.h index e0a20399266e3f138ee04403113a885f7a1fac02..fbb33e78217c0ef301fdf63f3843a1b23fe0a9c5 100644 --- a/components/libc/signal/posix_signal.h +++ b/components/libc/signal/posix_signal.h @@ -97,7 +97,6 @@ struct sigevent { int sigev_signo; union sigval sigev_value; - void (*sigev_notify_function)( union sigval ); pthread_attr_t *sigev_notify_attributes; diff --git a/include/libc/libc_signal.h b/include/libc/libc_signal.h index 759647cdd1eeecfcde119b2632868505d7c50c13..cc4552f990d4471f2b60551b9a1135b4562fe180 100644 --- a/include/libc/libc_signal.h +++ b/include/libc/libc_signal.h @@ -30,12 +30,26 @@ extern "C" { #endif +/* Signal Generation and Delivery, P1003.1b-1993, p. 63 + NOTE: P1003.1c/D10, p. 34 adds sigev_notify_function and + sigev_notify_attributes to the sigevent structure. */ + union sigval { int sival_int; /* Integer signal value */ void *sival_ptr; /* Pointer signal value */ }; +struct sigevent +{ + int sigev_notify; /* Notification type */ + int sigev_signo; /* Signal number */ + union sigval sigev_value; /* Signal value */ + void (*sigev_notify_function)( union sigval ); + /* Notification function */ + void *sigev_notify_attributes; /* Notification Attributes, really pthread_attr_t */ +}; + struct siginfo { rt_uint8_t si_signo;