Index: trunk/psLib/src/sys/psError.c
===================================================================
--- trunk/psLib/src/sys/psError.c	(revision 4367)
+++ trunk/psLib/src/sys/psError.c	(revision 4392)
@@ -10,6 +10,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-22 02:05:41 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -62,5 +62,5 @@
     err->code = code;
 
-    psMemSetDeallocator(err,(psFreeFcn)errFree);
+    psMemSetDeallocator(err,(psFreeFunc)errFree);
 
     return err;
Index: trunk/psLib/src/sys/psErrorCodes.c
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.c	(revision 4367)
+++ trunk/psLib/src/sys/psErrorCodes.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:44:21 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -105,5 +105,5 @@
     }
 
-    psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);
+    psMemSetDeallocator(err,(psFreeFunc)freeErrorDescription);
     return err;
 }
Index: trunk/psLib/src/sys/psMemory.c
===================================================================
--- trunk/psLib/src/sys/psMemory.c	(revision 4367)
+++ trunk/psLib/src/sys/psMemory.c	(revision 4392)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-20 22:42:30 $
+*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -640,5 +640,5 @@
 }
 
-void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)
+void psMemSetDeallocator(psPtr vptr, psFreeFunc freeFcn)
 {
     if (vptr == NULL) {
@@ -655,5 +655,5 @@
 
 }
-psFreeFcn psMemGetDeallocator(psPtr vptr)
+psFreeFunc psMemGetDeallocator(psPtr vptr)
 {
     if (vptr == NULL) {
Index: trunk/psLib/src/sys/psMemory.h
===================================================================
--- trunk/psLib/src/sys/psMemory.h	(revision 4367)
+++ trunk/psLib/src/sys/psMemory.h	(revision 4392)
@@ -12,6 +12,6 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
 
 /// typedef for deallocator.
-typedef void (*psFreeFcn) (psPtr ptr);
+typedef void (*psFreeFunc) (psPtr ptr);
 
 /** Book-keeping data for storage allocator.
@@ -67,5 +67,5 @@
     struct psMemBlock* previousBlock;  ///< previous block in allocation list
     struct psMemBlock* nextBlock;      ///< next block allocation list
-    psFreeFcn freeFcn;                 ///< deallocator.  If NULL, use generic deallocation.
+    psFreeFunc freeFcn;                 ///< deallocator.  If NULL, use generic deallocation.
     size_t userMemorySize;             ///< the size of the user-portion of the memory block
     const psMemoryId id;               ///< a unique ID for this allocation
@@ -152,5 +152,5 @@
 void psMemSetDeallocator(
     psPtr ptr,                         ///< the memory block to operate on
-    psFreeFcn freeFcn                  ///< the function to be executed at deallocation
+    psFreeFunc freeFcn                  ///< the function to be executed at deallocation
 );
 
@@ -162,7 +162,7 @@
  *  within a struct.
  *
- *  @return psFreeFcn    the routine to be called at deallocation.
- */
-psFreeFcn psMemGetDeallocator(
+ *  @return psFreeFunc    the routine to be called at deallocation.
+ */
+psFreeFunc psMemGetDeallocator(
     psPtr ptr                          ///< the memory block
 );
Index: trunk/psLib/src/sys/psTrace.c
===================================================================
--- trunk/psLib/src/sys/psTrace.c	(revision 4367)
+++ trunk/psLib/src/sys/psTrace.c	(revision 4392)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67,5 +67,5 @@
 
     p_psMemSetPersistent(comp,true);
-    psMemSetDeallocator(comp, (psFreeFcn) componentFree);
+    psMemSetDeallocator(comp, (psFreeFunc) componentFree);
     comp->name = psStringCopy(name);
     p_psMemSetPersistent((psPtr)comp->name,true);