From c1c798fbc384ff625a1ca3cd0189d0899feb0e4a Mon Sep 17 00:00:00 2001
From: roland <roland@van-straten.org>
Date: Sat, 4 Aug 2018 09:47:40 +0200
Subject: [PATCH] drivers/cc3000: Use cc3000_time_t instead of time_t for
custom typedef.
Otherwise it can clash with time_t from the C standard include headers.
---
drivers/cc3000/inc/cc3000_common.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/cc3000/inc/cc3000_common.h b/drivers/cc3000/inc/cc3000_common.h
index aa1624231..d0c4b1d4b 100644
--- a/drivers/cc3000/inc/cc3000_common.h
+++ b/drivers/cc3000/inc/cc3000_common.h
@@ -165,7 +165,7 @@ extern int CC3000_EXPORT(errno);
//*****************************************************************************
// Compound Types
//*****************************************************************************
-typedef INT32 time_t;
+typedef INT32 cc3000_time_t;
typedef UINT32 clock_t;
typedef INT32 suseconds_t;
@@ -173,7 +173,7 @@ typedef struct cc3000_timeval cc3000_timeval;
struct cc3000_timeval
{
- time_t tv_sec; /* seconds */
+ cc3000_time_t tv_sec; /* seconds */
suseconds_t tv_usec; /* microseconds */
};
--
GitLab