diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-05-10 23:46:00 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-05-10 23:46:00 +0100 |
| commit | ce2d34d74ff3b9fc1179ea0cf2be44b49de3f7f8 (patch) | |
| tree | 048b9a70c43de8c449fa8d8c358d5fd42a862fa0 /drivers/cc3000 | |
| parent | 79a38a7a430a43197366fe45201511302b9403cc (diff) | |
| download | micropython-ce2d34d74ff3b9fc1179ea0cf2be44b49de3f7f8.tar.gz micropython-ce2d34d74ff3b9fc1179ea0cf2be44b49de3f7f8.zip | |
drivers/cc3000: Rename timeval to cc3000_timeval, to avoid clash.
The timeval struct can be defined by system C headers.
Diffstat (limited to 'drivers/cc3000')
| -rw-r--r-- | drivers/cc3000/inc/cc3000_common.h | 4 | ||||
| -rw-r--r-- | drivers/cc3000/inc/socket.h | 2 | ||||
| -rw-r--r-- | drivers/cc3000/src/socket.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cc3000/inc/cc3000_common.h b/drivers/cc3000/inc/cc3000_common.h index d263da6591..aa16242310 100644 --- a/drivers/cc3000/inc/cc3000_common.h +++ b/drivers/cc3000/inc/cc3000_common.h @@ -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 */ diff --git a/drivers/cc3000/inc/socket.h b/drivers/cc3000/inc/socket.h index 8c2a0aa16b..96c814bf77 100644 --- a/drivers/cc3000/inc/socket.h +++ b/drivers/cc3000/inc/socket.h @@ -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); //***************************************************************************** // diff --git a/drivers/cc3000/src/socket.c b/drivers/cc3000/src/socket.c index 6261caeb0a..ddd7e56e80 100644 --- a/drivers/cc3000/src/socket.c +++ b/drivers/cc3000/src/socket.c @@ -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; |