mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/cc3000: Rename timeval to cc3000_timeval, to avoid clash. 

The timeval struct can be defined by system C headers.
This commit is contained in:
Damien George 2016-05-10 23:46:00 +01:00
parent 79a38a7a43
commit ce2d34d74f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cc3000/inc/cc3000_common.h
View File

@ -169,9 +169,9 @@ typedef INT32 time_t;
typedef UINT32 clock_t;
typedef INT32 suseconds_t;
typedef struct timeval timeval;
typedef struct cc3000_timeval cc3000_timeval;
struct timeval
struct cc3000_timeval
{
time_t tv_sec; /* seconds */
suseconds_t tv_usec; /* microseconds */

2
drivers/cc3000/inc/socket.h
View File

@ -416,7 +416,7 @@ extern INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrle
//
//*****************************************************************************
extern INT16 CC3000_EXPORT(select)(INT32 nfds, fd_set *readsds, fd_set *writesds,
fd_set *exceptsds, struct timeval *timeout);
fd_set *exceptsds, struct cc3000_timeval *timeout);
//*****************************************************************************
//

2
drivers/cc3000/src/socket.c
View File

@ -587,7 +587,7 @@ INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrlen)
//*****************************************************************************
INT16 CC3000_EXPORT(select)(INT32 nfds, fd_set *readsds, fd_set *writesds, fd_set *exceptsds,
struct timeval *timeout)
struct cc3000_timeval *timeout)
{
UINT8 *ptr, *args;
tBsdSelectRecvParams tParams;