From ce2d34d74ff3b9fc1179ea0cf2be44b49de3f7f8 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 10 May 2016 23:46:00 +0100
Subject: [PATCH] drivers/cc3000: Rename timeval to cc3000_timeval, to avoid
clash.
The timeval struct can be defined by system C headers.
---
drivers/cc3000/inc/cc3000_common.h | 4 ++--
drivers/cc3000/inc/socket.h | 2 +-
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 d263da659..aa1624231 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 8c2a0aa16..96c814bf7 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 6261caeb0..ddd7e56e8 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;
--
GitLab