Merge pull request #14540 from mjbogusz/fix-clang-timeval

Improve condition for declaring `struct timeval`
ARMmbed · Apr 28, 2021 · a32a45c · a32a45c
2 parents 924652d + f1d8378
commit a32a45c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/platform/include/platform/mbed_rtc_time.h b/platform/include/platform/mbed_rtc_time.h
@@ -32,8 +32,13 @@ extern "C" {
  * @{
  */
 
-/* Timeval definition for non GCC_ARM toolchains */
-#if !defined(__GNUC__) || defined(__clang__)
+/* Timeval definition for non GCC_ARM toolchains,
+ * Note: The GNU libc defines _TIMEVAL_DEFINED and the newlib defines __timeval_defined,
+ * thus the double-check and double-define
+ */
+#if !defined(__timeval_defined) && !defined(_TIMEVAL_DEFINED)
+#define __timeval_defined 1
+#define _TIMEVAL_DEFINED
 struct timeval {
     time_t tv_sec;
     int32_t tv_usec;