From 893103c3c231fed00aeacb5ecfa84d7f67eff6e7 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 10 Jun 1996 20:49:08 +0000
Subject: moved the time macros to pmacros.h.

---
 testsuites/psxtests/psx01/init.c   | 34 +---------------------------------
 testsuites/psxtests/psx01/system.h |  5 +----
 testsuites/psxtests/psx01/task.c   |  3 ++-
 3 files changed, 4 insertions(+), 38 deletions(-)

(limited to 'testsuites/psxtests/psx01')

diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c
index 2d69a3786a..75aa73ac65 100644
--- a/testsuites/psxtests/psx01/init.c
+++ b/testsuites/psxtests/psx01/init.c
@@ -14,36 +14,6 @@
 #include "system.h"
 #include <sched.h>
 
-#define TM_SUNDAY    0
-#define TM_MONDAY    1
-#define TM_TUESDAY   2
-#define TM_WEDNESDAY 3
-#define TM_THURSDAY  4
-#define TM_FRIDAY    5
-#define TM_SATURDAY  6
-
-#define TM_JANUARY     0
-#define TM_FEBRUARY    1
-#define TM_MARCH       2
-#define TM_APRIL       3
-#define TM_MAY         4
-#define TM_JUNE        5
-#define TM_JULY        6
-#define TM_AUGUST      7
-#define TM_SEPTEMBER   8
-#define TM_OCTOBER    10
-#define TM_NOVEMBER   12
-#define TM_DECEMBER   12
-
-
-#define build_time( TM, WEEKDAY, MON, DAY, YR, HR, MIN, SEC ) \
-  { (TM)->tm_year = YR;  \
-    (TM)->tm_mon  = MON; \
-    (TM)->tm_mday = DAY; \
-    (TM)->tm_wday  = WEEKDAY; \
-    (TM)->tm_hour = HR;  \
-    (TM)->tm_min  = MIN; \
-    (TM)->tm_sec  = SEC; }
 
 void *POSIX_Init(
   void *argument
@@ -151,7 +121,5 @@ void *POSIX_Init(
 
   pthread_exit( NULL );
 
-  /* just to satisfy compilers which think we did not return anything */
-
-  return NULL;
+  return NULL; /* just so the compiler thinks we returned something */
 }
diff --git a/testsuites/psxtests/psx01/system.h b/testsuites/psxtests/psx01/system.h
index 3b776a082d..3abfff0e19 100644
--- a/testsuites/psxtests/psx01/system.h
+++ b/testsuites/psxtests/psx01/system.h
@@ -16,10 +16,7 @@
 
 /* functions */
 
-#include <bsp.h>
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
+#include <pmacros.h>
 #include <unistd.h>
 
 void *POSIX_Init(
diff --git a/testsuites/psxtests/psx01/task.c b/testsuites/psxtests/psx01/task.c
index f26c660f70..61095cf119 100644
--- a/testsuites/psxtests/psx01/task.c
+++ b/testsuites/psxtests/psx01/task.c
@@ -25,7 +25,6 @@ void *Task_1_through_3(
   void *argument
 )
 {
-  int seconds;
   int status;
 
   /* XXX temporary */
@@ -47,4 +46,6 @@ void *Task_1_through_3(
 
   puts( "*** END OF POSIX TEST 1 ***" );
   exit( 0 );
+
+  return NULL; /* just so the compiler thinks we returned something */
 }
-- 
cgit v1.2.3