Index: trunk/psLib/test/dataManip/tst_psMinimize05.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize05.c	(revision 2081)
+++ trunk/psLib/test/dataManip/tst_psMinimize05.c	(revision 2204)
@@ -15,5 +15,5 @@
 #define ERROR_TOLERANCE 0.10
 float expectedParm[NUM_PARAMS];
-int testStatus = true;
+psS32 testStatus = true;
 
 /*****************************************************************************
@@ -32,5 +32,5 @@
     float coordData = 0.0;
     float expData = 0.0;
-    int i;
+    psS32 i;
 
     for (i=0;i<N;i++) {
@@ -62,9 +62,9 @@
 
 
-int t00()
-{
-    int currentId = psMemGetId();
-    int memLeaks = 0;
-    int i = 0;
+psS32 t00()
+{
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks = 0;
+    psS32 i = 0;
     psArray *myCoords;
     psVector *myParams;
@@ -81,5 +81,5 @@
     myCoords = psArrayAlloc(N);
     for (i=0;i<N;i++) {
-        myCoords->data[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32);
+        myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
         ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10);
         ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3);
@@ -137,9 +137,9 @@
 }
 
-int t01()
-{
-    int currentId = psMemGetId();
-    int memLeaks = 0;
-    int i = 0;
+psS32 t01()
+{
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks = 0;
+    psS32 i = 0;
     psArray *myCoords;
     psVector *myParams;
@@ -154,5 +154,5 @@
     myCoords = psArrayAlloc(N);
     for (i=0;i<N;i++) {
-        myCoords->data[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32);
+        myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
         ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10);
         ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3);
@@ -208,9 +208,9 @@
 }
 
-int t02()
-{
-    int currentId = psMemGetId();
-    int memLeaks = 0;
-    int i = 0;
+psS32 t02()
+{
+    psS32 currentId = psMemGetId();
+    psS32 memLeaks = 0;
+    psS32 i = 0;
     psArray *myCoords;
     psVector *myParams;
@@ -227,5 +227,5 @@
     myCoords = psArrayAlloc(N);
     for (i=0;i<N;i++) {
-        myCoords->data[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32);
+        myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
         ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10);
         ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3);
@@ -269,5 +269,5 @@
 }
 
-int main()
+psS32 main()
 {
     t00();