summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-22 14:28:19 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-22 14:28:19 +0000
commit650526857e8abdfb262dde26ee27a6448e72f0c9 (patch)
tree7e16991046be1ece562eb19a785c4fe17d955373
parent6b910bd2d2f17530ab10780cd0d3624a10516ddf (diff)
downloadrtems-650526857e8abdfb262dde26ee27a6448e72f0c9.tar.bz2
Added ifndef around build_time macro so tmacros.h and pmacros.h
can be included from the same file.
Diffstat (limited to '')
-rw-r--r--c/src/tests/psxtests/include/pmacros.h2
-rw-r--r--c/src/tests/psxtests/support/include/pmacros.h2
-rw-r--r--testsuites/psxtests/include/pmacros.h2
3 files changed, 6 insertions, 0 deletions
diff --git a/c/src/tests/psxtests/include/pmacros.h b/c/src/tests/psxtests/include/pmacros.h
index 1f15dac9c0..38d0ee1904 100644
--- a/c/src/tests/psxtests/include/pmacros.h
+++ b/c/src/tests/psxtests/include/pmacros.h
@@ -38,6 +38,7 @@
#define TM_NOVEMBER 12
#define TM_DECEMBER 12
+#ifndef build_time
#define build_time( TM, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
{ (TM)->tm_year = YR; \
(TM)->tm_mon = MON; \
@@ -46,6 +47,7 @@
(TM)->tm_hour = HR; \
(TM)->tm_min = MIN; \
(TM)->tm_sec = SEC; }
+#endif
#define set_time( WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
do { \
diff --git a/c/src/tests/psxtests/support/include/pmacros.h b/c/src/tests/psxtests/support/include/pmacros.h
index 1f15dac9c0..38d0ee1904 100644
--- a/c/src/tests/psxtests/support/include/pmacros.h
+++ b/c/src/tests/psxtests/support/include/pmacros.h
@@ -38,6 +38,7 @@
#define TM_NOVEMBER 12
#define TM_DECEMBER 12
+#ifndef build_time
#define build_time( TM, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
{ (TM)->tm_year = YR; \
(TM)->tm_mon = MON; \
@@ -46,6 +47,7 @@
(TM)->tm_hour = HR; \
(TM)->tm_min = MIN; \
(TM)->tm_sec = SEC; }
+#endif
#define set_time( WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
do { \
diff --git a/testsuites/psxtests/include/pmacros.h b/testsuites/psxtests/include/pmacros.h
index 1f15dac9c0..38d0ee1904 100644
--- a/testsuites/psxtests/include/pmacros.h
+++ b/testsuites/psxtests/include/pmacros.h
@@ -38,6 +38,7 @@
#define TM_NOVEMBER 12
#define TM_DECEMBER 12
+#ifndef build_time
#define build_time( TM, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
{ (TM)->tm_year = YR; \
(TM)->tm_mon = MON; \
@@ -46,6 +47,7 @@
(TM)->tm_hour = HR; \
(TM)->tm_min = MIN; \
(TM)->tm_sec = SEC; }
+#endif
#define set_time( WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
do { \