diff options
| author | guochuangjian <[email protected]> | 2018-08-05 15:08:50 +0800 |
|---|---|---|
| committer | guochuangjian <[email protected]> | 2018-08-05 15:08:50 +0800 |
| commit | 3de51fe25688f0b6c7cb9f9d424861654fb09e49 (patch) | |
| tree | dcf4a170b00deace7860187e3ff9c2e6495e0923 /include/libc | |
| parent | 650f06aa1943d439ac049f6bc276b216999e6a56 (diff) | |
| parent | 03bf99a56de255d41655bc8486d50cadbcae22f0 (diff) | |
fix usRcvBufferPos == MB_SER_PDU_SIZE_MAX bug
Diffstat (limited to 'include/libc')
| -rw-r--r-- | include/libc/libc_fdset.h | 2 | ||||
| -rw-r--r-- | include/libc/libc_signal.h | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/include/libc/libc_fdset.h b/include/libc/libc_fdset.h index 057cc7fed2..74c4ba1cb2 100644 --- a/include/libc/libc_fdset.h +++ b/include/libc/libc_fdset.h @@ -35,7 +35,7 @@ #else -#ifdef RT_USING_DFS_NET +#ifdef SAL_USING_POSIX #ifdef FD_SETSIZE #undef FD_SETSIZE diff --git a/include/libc/libc_signal.h b/include/libc/libc_signal.h index dabcad1a34..d3050bfb54 100644 --- a/include/libc/libc_signal.h +++ b/include/libc/libc_signal.h @@ -25,12 +25,15 @@ #ifndef LIBC_SIGNAL_H__ #define LIBC_SIGNAL_H__ - #ifdef __cplusplus extern "C" { #endif -#ifndef HAVE_SYS_SIGNALS +#ifdef HAVE_CCONFIG_H +#include <cconfig.h> +#endif + +#ifndef HAVE_SIGVAL /* 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. */ @@ -40,7 +43,9 @@ union sigval int sival_int; /* Integer signal value */ void *sival_ptr; /* Pointer signal value */ }; +#endif +#ifndef HAVE_SIGEVENT struct sigevent { int sigev_notify; /* Notification type */ @@ -50,12 +55,13 @@ struct sigevent /* Notification function */ void *sigev_notify_attributes; /* Notification Attributes, really pthread_attr_t */ }; +#endif +#ifndef HAVE_SIGINFO struct siginfo { - rt_uint8_t si_signo; - rt_uint8_t si_code; - rt_int16_t si_errno; + rt_uint16_t si_signo; + rt_uint16_t si_code; union sigval si_value; }; |
