From 4d6e275fc4b7cfc9746230ee243b88d433faa46c Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Wed, 19 Feb 2020 16:45:47 +0800 Subject: [PATCH] libs/libc/time/lib_gmtimer.c: Remove duplicate definition time/lib_gmtimer.c:54: warning: "SEC_PER_MIN" redefined 54 | #define SEC_PER_MIN ((time_t)60) | In file included from nuttx/include/nuttx/semaphore.h:48, from nuttx/include/pthread.h:56, from nuttx/include/signal.h:50, from nuttx/include/sys/select.h:46, from nuttx/include/sys/types.h:305, from nuttx/include/time.h:46, from time/lib_gmtimer.c:44: nuttx/include/nuttx/clock.h:125: note: this is the location of the previous definition 125 | #define SEC_PER_MIN 60L | time/lib_gmtimer.c:55: warning: "SEC_PER_HOUR" redefined 55 | #define SEC_PER_HOUR ((time_t)60 * SEC_PER_MIN) | In file included from nuttx/include/nuttx/semaphore.h:48, from nuttx/include/pthread.h:56, from nuttx/include/signal.h:50, from nuttx/include/sys/select.h:46, from nuttx/include/sys/types.h:305, from nuttx/include/time.h:46, from time/lib_gmtimer.c:44: nuttx/include/nuttx/clock.h:138: note: this is the location of the previous definition 138 | #define SEC_PER_HOUR (SEC_PER_MIN * MIN_PER_HOUR) | time/lib_gmtimer.c:56: warning: "SEC_PER_DAY" redefined 56 | #define SEC_PER_DAY ((time_t)24 * SEC_PER_HOUR) | In file included from nuttx/include/nuttx/semaphore.h:48, from nuttx/include/pthread.h:56, from nuttx/include/signal.h:50, from nuttx/include/sys/select.h:46, from nuttx/include/sys/types.h:305, from nuttx/include/time.h:46, from time/lib_gmtimer.c:44: nuttx/include/nuttx/clock.h:141: note: this is the location of the previous definition 141 | #define SEC_PER_DAY (HOURS_PER_DAY * SEC_PER_HOUR) | --- libs/libc/time/lib_gmtimer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libs/libc/time/lib_gmtimer.c b/libs/libc/time/lib_gmtimer.c index b2c17fc5e5..6012b2cc45 100644 --- a/libs/libc/time/lib_gmtimer.c +++ b/libs/libc/time/lib_gmtimer.c @@ -47,14 +47,6 @@ #include -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#define SEC_PER_MIN ((time_t)60) -#define SEC_PER_HOUR ((time_t)60 * SEC_PER_MIN) -#define SEC_PER_DAY ((time_t)24 * SEC_PER_HOUR) - /**************************************************************************** * Private Function Prototypes ****************************************************************************/