Index: trunk/psLib/src/sysUtils/psMemory.c
===================================================================
--- trunk/psLib/src/sysUtils/psMemory.c	(revision 4392)
+++ trunk/psLib/src/sysUtils/psMemory.c	(revision 4397)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-25 02:02:05 $
+*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 03:32:42 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
  * Unique ID for allocated blocks
  */
-static psMemoryId memid = 0;
+static psMemId memid = 0;
 
 /**
@@ -88,14 +88,14 @@
  * isn't resignalled)
  */
-static psMemoryId memAllocateCallbackDefault(const psMemBlock* ptr)
-{
-    static psMemoryId incr = 0; // "p_psMemAllocateID += incr"
+static psMemId memAllocateCallbackDefault(const psMemBlock* ptr)
+{
+    static psMemId incr = 0; // "p_psMemAllocateID += incr"
 
     return incr;
 }
 
-static psMemoryId memFreeCallbackDefault(const psMemBlock* ptr)
-{
-    static psMemoryId incr = 0; // "p_psMemFreeID += incr"
+static psMemId memFreeCallbackDefault(const psMemBlock* ptr)
+{
+    static psMemId incr = 0; // "p_psMemFreeID += incr"
 
     return incr;
@@ -194,10 +194,10 @@
  * Call the callbacks when these IDs are allocated/freed
  */
-psMemoryId p_psMemAllocateID = 0;       // notify user this block is allocated
-psMemoryId p_psMemFreeID = 0;   // notify user this block is freed
-
-psMemoryId psMemAllocateCallbackSetID(psMemoryId id)
-{
-    psMemoryId old = p_psMemAllocateID;
+psMemId p_psMemAllocateID = 0;       // notify user this block is allocated
+psMemId p_psMemFreeID = 0;   // notify user this block is freed
+
+psMemId psMemAllocateCallbackSetID(psMemId id)
+{
+    psMemId old = p_psMemAllocateID;
 
     p_psMemAllocateID = id;
@@ -206,7 +206,7 @@
 }
 
-psMemoryId psMemFreeCallbackSetID(psMemoryId id)
-{
-    psMemoryId old = p_psMemFreeID;
+psMemId psMemFreeCallbackSetID(psMemId id)
+{
+    psMemId old = p_psMemFreeID;
 
     p_psMemFreeID = id;
@@ -244,7 +244,7 @@
  * Return memory ID counter for next block to be allocated
  */
-psMemoryId psMemGetId(void)
-{
-    psMemoryId id;
+psMemId psMemGetId(void)
+{
+    psMemId id;
 
     pthread_mutex_lock(&memIdMutex);
@@ -338,5 +338,5 @@
     // increment the memory id safely.
     pthread_mutex_lock(&memBlockListMutex);
-    *(psMemoryId* ) & ptr->id = ++memid;
+    *(psMemId* ) & ptr->id = ++memid;
     pthread_mutex_unlock(&memBlockListMutex);
 
@@ -448,5 +448,5 @@
  * Check for memory leaks.
  */
-psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd, psBool persistence)
+psS32 psMemCheckLeaks(psMemId id0, psMemBlock* ** arr, FILE * fd, psBool persistence)
 {
     psS32 nleak = 0;