drivers/cc3000: Rename timeval to cc3000_timeval, to avoid clash.

dpgeorge · dpgeorge · commit ce2d34d74ff3 · 2016-05-10T23:46:00.000+01:00
The timeval struct can be defined by system C headers.
diff --git 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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrlen)`
`587`	`587`	`//*****************************************************************************`
`588`	`588`
`589`	`589`	`INT16 CC3000_EXPORT(select)(INT32 nfds, fd_set readsds, fd_set writesds, fd_set *exceptsds,`
`590`		`-struct timeval *timeout)`
	`590`	`+struct cc3000_timeval *timeout)`
`591`	`591`	`{`
`592`	`592`	`UINT8 ptr, args;`
`593`	`593`	`tBsdSelectRecvParams tParams;`