Index: trunk/psLib/test/psTest.c
===================================================================
--- trunk/psLib/test/psTest.c	(revision 1810)
+++ trunk/psLib/test/psTest.c	(revision 2204)
@@ -28,13 +28,13 @@
 #define HEADER_BOTTOM "\\**********************************************************************************/\n\n"
 
-bool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName,
-                     testDescription tests[], int argc, char * const argv[] )
-{
-    bool success = true;
-    bool runAll = true;
-    bool useFork = true;
-    bool found;
-    int c;
-    int n;
+psBool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName,
+                       testDescription tests[], psS32 argc, char * const argv[] )
+{
+    psBool success = true;
+    psBool runAll = true;
+    psBool useFork = true;
+    psBool found;
+    psS32 c;
+    psS32 n;
     extern char *optarg;
 
@@ -62,5 +62,5 @@
                 printf( "Testpoints:\n" );
                 runAll = false;
-                for ( int index = 0; tests[ index ].fcn != NULL; index++ ) {
+                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
                     printf( "    %6d - %s \n", tests[ index ].testPointNumber,
                             tests[ index ].testPointName );
@@ -70,5 +70,5 @@
             case 't':
                 runAll = false;
-                for ( int index = 0; tests[ index ].fcn != NULL; index++ ) {
+                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
                     if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) {
                         success = p_runTest( fp,
@@ -90,5 +90,5 @@
                 }
                 found = false;
-                for ( int index = 0; tests[ index ].fcn != NULL; index++ ) {
+                for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
                     if ( n == tests[ index ].testPointNumber ) {
                         found = true;
@@ -116,5 +116,5 @@
 
     if ( runAll ) {
-        for ( int index = 0; tests[ index ].fcn != NULL; index++ ) {
+        for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) {
             if ( ! tests[ index ].isDuplicateEntry ) {
                 success = p_runTest( fp,
@@ -136,8 +136,8 @@
 }
 
-bool p_runTest( FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
-                testFcn fcn, int expectedReturn, bool useFork )
-{
-    int childReturn = 0;
+psBool p_runTest( FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
+                  testFcn fcn, psS32 expectedReturn, psBool useFork )
+{
+    psS32 childReturn = 0;
     pid_t child;
 
@@ -147,6 +147,6 @@
         child = fork();
         if ( child == 0 ) {                   // I am the child process, run the test
-            int currentId = psMemGetId();
-            int retVal = fcn();
+            psS32 currentId = psMemGetId();
+            psS32 retVal = fcn();
             if ( retVal == 0 ) { // only bother checking memory if test executed to end.
                 if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) {
@@ -171,5 +171,5 @@
         }
     } else {
-        int currentId = psMemGetId();
+        psS32 currentId = psMemGetId();
         childReturn = fcn();
         if ( childReturn == 0 ) { // only bother checking memory if test executed to end.
@@ -215,5 +215,5 @@
                                 const char* testPointName,
                                 const char* expectedError,
-                                int exitValue )
+                                psS32 exitValue )
 {
     char TP[ 80 ];
@@ -235,5 +235,5 @@
                     const char* packageName,
                     const char* testPointName,
-                    bool success )
+                    psBool success )
 {
     if ( success ) {