From e39c85b718f37aec19c637ef4bdb04fbe15ee0fb Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 23 Jan 2016 17:03:46 -0600
Subject: [PATCH] Eliminate a warning about a symbol being redefined

---
 examples/elf/tests/signal/signal.c    | 15 ++++++++++++---
 examples/nxflat/tests/signal/signal.c | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/examples/elf/tests/signal/signal.c b/examples/elf/tests/signal/signal.c
index 1ee0e360a..a1f148882 100644
--- a/examples/elf/tests/signal/signal.c
+++ b/examples/elf/tests/signal/signal.c
@@ -50,9 +50,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define USEC_PER_MSEC 1000
-#define MSEC_PER_SEC  1000
-#define USEC_PER_SEC  (USEC_PER_MSEC * MSEC_PER_SEC)
+#ifndef USEC_PER_MSEC
+#  define USEC_PER_MSEC 1000L
+#endif
+
+#ifndef MSEC_PER_SEC
+#  define MSEC_PER_SEC  1000L
+#endif
+
+#ifndef USEC_PER_SEC
+#  define USEC_PER_SEC  (USEC_PER_MSEC * MSEC_PER_SEC)
+#endif
+
 #define SHORT_DELAY   (USEC_PER_SEC / 3)
 
 /****************************************************************************
diff --git a/examples/nxflat/tests/signal/signal.c b/examples/nxflat/tests/signal/signal.c
index a6f7b1cb0..4e7f64fdc 100644
--- a/examples/nxflat/tests/signal/signal.c
+++ b/examples/nxflat/tests/signal/signal.c
@@ -50,9 +50,18 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define USEC_PER_MSEC 1000
-#define MSEC_PER_SEC  1000
-#define USEC_PER_SEC  (USEC_PER_MSEC * MSEC_PER_SEC)
+#ifndef USEC_PER_MSEC
+#  define USEC_PER_MSEC 1000L
+#endif
+
+#ifndef MSEC_PER_SEC
+#  define MSEC_PER_SEC  1000L
+#endif
+
+#ifndef USEC_PER_SEC
+#  define USEC_PER_SEC  (USEC_PER_MSEC * MSEC_PER_SEC)
+#endif
+
 #define SHORT_DELAY   (USEC_PER_SEC / 3)
 
 /****************************************************************************