浏览代码

[libc] move `struct sigevent` to libc_signal.h file.

BernardXiong 7 年之前
父节点
当前提交
4bc082e7cb
共有 3 个文件被更改,包括 14 次插入22 次删除
  1. 0 21
      components/libc/pthreads/pthread.h
  2. 0 1
      components/libc/signal/posix_signal.h
  3. 14 0
      include/libc/libc_signal.h

+ 0 - 21
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

+ 0 - 1
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;

+ 14 - 0
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;