summaryrefslogtreecommitdiffstatshomepage
path: root/drivers/cc3000/inc/socket.h
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2016-05-10 23:46:00 +0100
committerDamien George <damien.p.george@gmail.com>2016-05-10 23:46:00 +0100
commitce2d34d74ff3b9fc1179ea0cf2be44b49de3f7f8 (patch)
tree048b9a70c43de8c449fa8d8c358d5fd42a862fa0 /drivers/cc3000/inc/socket.h
parent79a38a7a430a43197366fe45201511302b9403cc (diff)
downloadmicropython-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/inc/socket.h')
-rw-r--r--drivers/cc3000/inc/socket.h2
1 files changed, 1 insertions, 1 deletions
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);
//*****************************************************************************
//