Index: trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- trunk/psLib/src/astronomy/psAstrometry.c	(revision 3671)
+++ trunk/psLib/src/astronomy/psAstrometry.c	(revision 3682)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-31 23:01:46 $
+ *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-07 20:27:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -191,5 +191,5 @@
     }
 
-    p_psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree);
+    psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree);
 
     return(tmp);
@@ -238,5 +238,5 @@
     exp->telescopeName = NULL;
 
-    p_psMemSetDeallocator(exp,(psFreeFcn)exposureFree);
+    psMemSetDeallocator(exp,(psFreeFcn)exposureFree);
 
     return exp;
@@ -263,5 +263,5 @@
     *(double *)&obs->tlr = tlr;
 
-    p_psMemSetDeallocator(obs,(psFreeFcn)observatoryFree);
+    psMemSetDeallocator(obs,(psFreeFcn)observatoryFree);
 
     return obs;
@@ -304,5 +304,5 @@
     newFPA->chi2 = 0.0f;
 
-    p_psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree);
+    psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree);
 
     return newFPA;
@@ -338,5 +338,5 @@
     chip->parent = parentFPA;
 
-    p_psMemSetDeallocator(chip,(psFreeFcn)chipFree);
+    psMemSetDeallocator(chip,(psFreeFcn)chipFree);
 
     return chip;
@@ -376,5 +376,5 @@
     cell->parent = parentChip;
 
-    p_psMemSetDeallocator(cell,(psFreeFcn)cellFree);
+    psMemSetDeallocator(cell,(psFreeFcn)cellFree);
 
     return cell;
@@ -399,5 +399,5 @@
     readout->metadata = NULL;
 
-    p_psMemSetDeallocator(readout,(psFreeFcn)readoutFree);
+    psMemSetDeallocator(readout,(psFreeFcn)readoutFree);
 
     return readout;
Index: trunk/psLib/src/astronomy/psCoord.c
===================================================================
--- trunk/psLib/src/astronomy/psCoord.c	(revision 3671)
+++ trunk/psLib/src/astronomy/psCoord.c	(revision 3682)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 23:01:46 $
+*  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -214,5 +214,5 @@
     psPlane *p = psAlloc(sizeof(psPlane));
 
-    p_psMemSetDeallocator(p, (psFreeFcn) planeFree);
+    psMemSetDeallocator(p, (psFreeFcn) planeFree);
     return(p);
 }
@@ -228,5 +228,5 @@
     psSphere *s = psAlloc(sizeof(psSphere));
 
-    p_psMemSetDeallocator(s, (psFreeFcn) sphereFree);
+    psMemSetDeallocator(s, (psFreeFcn) sphereFree);
     return(s);
 }
@@ -247,5 +247,5 @@
     pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
 
-    p_psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
+    psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
     return(pt);
 }
@@ -293,5 +293,5 @@
     pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
 
-    p_psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
+    psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
     return(pt);
 }
@@ -508,5 +508,5 @@
     p->type = type;
 
-    p_psMemSetDeallocator(p, (psFreeFcn) projectionFree);
+    psMemSetDeallocator(p, (psFreeFcn) projectionFree);
     return(p);
 }
Index: trunk/psLib/src/astronomy/psMetadata.c
===================================================================
--- trunk/psLib/src/astronomy/psMetadata.c	(revision 3671)
+++ trunk/psLib/src/astronomy/psMetadata.c	(revision 3682)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-29 21:31:54 $
+*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-04-07 20:27:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -183,5 +183,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -252,5 +252,5 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    p_psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
 
     // Allocate metadata's internal containers
@@ -598,5 +598,5 @@
 
     // Set deallocator
-    p_psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
 
     if (regex == NULL) {