Skip to content

Commit ce2d34d

Browse files
committed
drivers/cc3000: Rename timeval to cc3000_timeval, to avoid clash.
The timeval struct can be defined by system C headers.
1 parent 79a38a7 commit ce2d34d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/cc3000/inc/cc3000_common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ typedef INT32 time_t;
169169
typedef UINT32 clock_t;
170170
typedef INT32 suseconds_t;
171171

172-
typedef struct timeval timeval;
172+
typedef struct cc3000_timeval cc3000_timeval;
173173

174-
struct timeval
174+
struct cc3000_timeval
175175
{
176176
time_t tv_sec; /* seconds */
177177
suseconds_t tv_usec; /* microseconds */

drivers/cc3000/inc/socket.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ extern INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrle
416416
//
417417
//*****************************************************************************
418418
extern INT16 CC3000_EXPORT(select)(INT32 nfds, fd_set *readsds, fd_set *writesds,
419-
fd_set *exceptsds, struct timeval *timeout);
419+
fd_set *exceptsds, struct cc3000_timeval *timeout);
420420

421421
//*****************************************************************************
422422
//

drivers/cc3000/src/socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrlen)
587587
//*****************************************************************************
588588

589589
INT16 CC3000_EXPORT(select)(INT32 nfds, fd_set *readsds, fd_set *writesds, fd_set *exceptsds,
590-
struct timeval *timeout)
590+
struct cc3000_timeval *timeout)
591591
{
592592
UINT8 *ptr, *args;
593593
tBsdSelectRecvParams tParams;

0 commit comments

Comments
 (0)