Index: trunk/psLib/test/psTest.h
===================================================================
--- trunk/psLib/test/psTest.h	(revision 1193)
+++ trunk/psLib/test/psTest.h	(revision 2204)
@@ -4,5 +4,6 @@
 
 #include <stdio.h>
-#include <stdbool.h>
+
+#include "psType.h"
 
 #define printPositiveTestHeader(filePtr, packageName, testPointName) \
@@ -15,13 +16,13 @@
 p_printFooter(filePtr, __FILE__, packageName, testPointName, success)
 
-typedef int (*testFcn)(void);
+typedef psS32 (*testFcn)(void);
 
 typedef struct
 {
     testFcn     fcn;
-    int         testPointNumber;
+    psS32       testPointNumber;
     const char* testPointName;
-    int         expectedReturn;
-    bool        isDuplicateEntry;
+    psS32       expectedReturn;
+    psBool      isDuplicateEntry;
 }
 testDescription;
@@ -36,5 +37,5 @@
 /////////////////////////// PRIVATE FUNCTIONS //////////////////////////////
 
-bool p_runTest(
+psBool p_runTest(
     FILE *fp,
     const char* testPointFile,
@@ -42,14 +43,14 @@
     const char* testPointName,
     testFcn fcn,
-    int expectedReturn,
-    bool useFork
+    psS32 expectedReturn,
+    psBool useFork
 );
 
-bool p_runTestSuite(
+psBool p_runTestSuite(
     FILE *fp,
     const char* testPointFile,
     const char* packageName,
     testDescription tests[],
-    int argc,
+    psS32 argc,
     char * const argv[]
 );
@@ -68,5 +69,5 @@
     const char* testPointName,
     const char* expectedError,
-    int exitValue
+    psS32 exitValue
 );
 
@@ -76,5 +77,5 @@
     const char* packageName,
     const char* testPointName,
-    bool success
+    psBool success
 );