Index: trunk/psLib/src/dataManip/psMinimize.c
===================================================================
--- trunk/psLib/src/dataManip/psMinimize.c	(revision 2211)
+++ trunk/psLib/src/dataManip/psMinimize.c	(revision 2212)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 19:58:54 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:07:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -252,7 +252,7 @@
     static psVector *yErr32Static = NULL;
 
-    PS_CHECK_NULL_PTR(mySpline, NULL);
-    PS_CHECK_NULL_PTR(y, NULL);
-    VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
+    PS_PTR_CHECK_NULL(mySpline, NULL);
+    PS_PTR_CHECK_NULL(y, NULL);
+    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
     CONVERT_VECTOR_F64_TO_F32(y, y32, y32Static);
 
@@ -262,5 +262,5 @@
         yErr32 = yErr32Static;
     } else {
-        VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
+        PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
         CONVERT_VECTOR_F64_TO_F32(yErr, yErr32, yErr32Static);
     }
@@ -271,5 +271,5 @@
         x32 = x32Static;
     } else {
-        VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
+        PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
         CONVERT_VECTOR_F64_TO_F32(x, x32, x32Static);
     }
@@ -425,8 +425,8 @@
                         psMinimizeLMChi2Func func)
 {
-    PS_CHECK_NULL_PTR(min, NULL);
+    PS_PTR_CHECK_NULL(min, NULL);
     PS_CHECK_NULL_VECTOR(params, NULL);
     PS_CHECK_EMPTY_VECTOR(params, NULL);
-    PS_CHECK_NULL_PTR(x, NULL);
+    PS_PTR_CHECK_NULL(x, NULL);
     PS_CHECK_NULL_VECTOR(y, NULL);
     PS_CHECK_EMPTY_VECTOR(y, NULL);
@@ -865,5 +865,5 @@
     static psVector *yErr64Static = NULL;
 
-    VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
+    PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
     CONVERT_VECTOR_F32_TO_F64(y, y64, y64Static);
 
@@ -873,5 +873,5 @@
         yErr64 = yErr64Static;
     } else {
-        VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
+        PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
         CONVERT_VECTOR_F32_TO_F64(yErr, yErr64, yErr64Static);
     }
@@ -885,5 +885,5 @@
         x64 = x64Static;
     } else {
-        VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
+        PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
         CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
     }
@@ -1321,7 +1321,7 @@
     PS_CHECK_NULL_VECTOR(params, NULL);
     PS_CHECK_EMPTY_VECTOR(params, NULL);
-    PS_CHECK_NULL_PTR(min, NULL);
-    PS_CHECK_NULL_PTR(coords, NULL);
-    PS_CHECK_NULL_PTR(func, NULL);
+    PS_PTR_CHECK_NULL(min, NULL);
+    PS_PTR_CHECK_NULL(coords, NULL);
+    PS_PTR_CHECK_NULL(func, NULL);
 
     psS32 numDims = params->n;