diff options
| author | Meco Man <[email protected]> | 2022-05-15 14:23:11 -0400 |
|---|---|---|
| committer | guo <[email protected]> | 2022-05-16 10:02:22 +0800 |
| commit | 19abf927d210338ea830908af7de37bb23d12682 (patch) | |
| tree | df74c4eb1fee1cae6dfee7cd3293fc6ff633edb7 /components/libc/compilers/common/sys | |
| parent | 2d418531242353fad21d6309704be5dc544c7d3e (diff) | |
[simulator] avoid conflicts between winsock.h and sys/time.h
Diffstat (limited to 'components/libc/compilers/common/sys')
| -rw-r--r-- | components/libc/compilers/common/sys/ioctl.h | 4 | ||||
| -rw-r--r-- | components/libc/compilers/common/sys/select.h | 6 | ||||
| -rw-r--r-- | components/libc/compilers/common/sys/time.h | 4 |
3 files changed, 1 insertions, 13 deletions
diff --git a/components/libc/compilers/common/sys/ioctl.h b/components/libc/compilers/common/sys/ioctl.h index 0243932cba..4f9287304e 100644 --- a/components/libc/compilers/common/sys/ioctl.h +++ b/components/libc/compilers/common/sys/ioctl.h @@ -11,10 +11,6 @@ #ifndef __SYS_IOCTL_H__ #define __SYS_IOCTL_H__ -#ifdef _WIN32 -#include <winsock.h> -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/components/libc/compilers/common/sys/select.h b/components/libc/compilers/common/sys/select.h index c939429279..1232edd6e8 100644 --- a/components/libc/compilers/common/sys/select.h +++ b/components/libc/compilers/common/sys/select.h @@ -16,10 +16,6 @@ #include <sys/types.h> #include <sys/time.h> -#ifdef _WIN32 -#include <winsock.h> -#endif - #ifdef __cplusplus extern "C" { #endif @@ -37,7 +33,6 @@ extern "C" { typedef long fd_mask; -#ifndef _WIN32 #ifndef _SYS_TYPES_FD_SET /* Newlib 2.2.0 or lower version */ #define NBBY 8 /* number of bits in a byte */ #define NFDBITS (sizeof (fd_mask) * NBBY) /* bits per mask */ @@ -57,7 +52,6 @@ typedef struct _types_fd_set { #endif /* _SYS_TYPES_FD_SET */ int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout); -#endif /* _WIN32 */ #ifdef __cplusplus } diff --git a/components/libc/compilers/common/sys/time.h b/components/libc/compilers/common/sys/time.h index 69d85fe094..b7b193d25a 100644 --- a/components/libc/compilers/common/sys/time.h +++ b/components/libc/compilers/common/sys/time.h @@ -17,8 +17,6 @@ #include <stdint.h> #include <time.h> #ifdef _WIN32 -#include <winsock.h> /* for struct timeval */ -#include <corecrt.h> /* for __time64_t */ typedef __time64_t time_t; #endif /* _WIN32 */ @@ -45,7 +43,7 @@ struct timezone int tz_dsttime; /* type of dst correction */ }; -#if !defined(_TIMEVAL_DEFINED) && !defined(_WIN32) +#if !defined(_TIMEVAL_DEFINED) #define _TIMEVAL_DEFINED struct timeval { |