summaryrefslogtreecommitdiffstatshomepage
path: root/drivers/cc3000/inc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/cc3000/inc')
-rw-r--r--drivers/cc3000/inc/cc3000_common.h4
-rw-r--r--drivers/cc3000/inc/socket.h2
2 files changed, 3 insertions, 3 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);
//*****************************************************************************
//