2 files changed, 11 insertions, 9 deletions
diff --git a/testsuites/psxtests/psx01/init.c b/testsuites/psxtests/psx01/init.c
index 61796ae035..ca56f58df6 100644
--- a/testsuites/psxtests/psx01/init.c
+++ b/testsuites/psxtests/psx01/init.c
@@ -1,5 +1,5 @@
 /*
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -25,7 +25,7 @@ void *POSIX_Init(
   pthread_t       thread_id;
   time_t          seconds;
   time_t          seconds1;
-  time_t          remaining;
+  unsigned int    remaining;
   struct tm       tm;
   struct utsname  uts;
   useconds_t      useconds;
@@ -58,12 +58,12 @@ void *POSIX_Init(
   rtems_test_assert( errno == EINVAL );
 
   puts( "Init: clock_gettime - EINVAL (invalid clockid)" );
-  status = clock_gettime( -1, &tv );
+  status = clock_gettime( (clockid_t)-1, &tv );
   rtems_test_assert( status == -1 );
   rtems_test_assert( errno == EINVAL );
 
   puts( "Init: clock_settime - EINVAL (invalid clockid)" );
-  status = clock_settime( -1, &tv );
+  status = clock_settime( (clockid_t)-1, &tv );
   rtems_test_assert( status == -1 );
   rtems_test_assert( errno == EINVAL );
 
@@ -79,7 +79,7 @@ void *POSIX_Init(
   /* exercise clock_getres */
 
   puts( "Init: clock_getres - EINVAL (invalid clockid)" );
-  status = clock_getres( -1, &tv );
+  status = clock_getres( (clockid_t) -1, &tv );
   rtems_test_assert( status == -1 );
   rtems_test_assert( errno == EINVAL );
 
@@ -195,7 +195,7 @@ void *POSIX_Init(
 
   puts( "Init: usleep - 1.35 seconds" );
   useconds = usleep ( 1350000 );
-  rtems_test_assert( useconds < 1350000);
+  rtems_test_assert( useconds < 1350000 );
   
   /* print the current real time again */
   status = clock_gettime( CLOCK_REALTIME, &tv );
diff --git a/testsuites/psxtests/psx01/task.c b/testsuites/psxtests/psx01/task.c
index 2a9cc379c1..5b8e3801b3 100644
--- a/testsuites/psxtests/psx01/task.c
+++ b/testsuites/psxtests/psx01/task.c
@@ -8,7 +8,7 @@
  *
  *  Output parameters:  NONE
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -20,6 +20,8 @@
 
 #include "system.h"
 
+void Test_init_routine( void );
+
 void Test_init_routine( void )
 {
   puts( "Test_init_routine: invoked" );
@@ -61,11 +63,11 @@ void *Task_1_through_3(
   assert( !status );
 
   puts( "Task_1: pthread_equal - first id bad" );
-  status = pthread_equal( -1, Task_id );
+  status = pthread_equal( (pthread_t) -1, Task_id );
   assert( !status );
 
   puts( "Task_1: pthread_equal - second id bad" );
-  status = pthread_equal( Init_id, -1 );
+  status = pthread_equal( Init_id, (pthread_t) -1 );
   assert( !status );
 
   /* exercise pthread_once */