Index: trunk/psLib/src/astronomy/astronomy.i
===================================================================
--- trunk/psLib/src/astronomy/astronomy.i	(revision 3169)
+++ trunk/psLib/src/astronomy/astronomy.i	(revision 3182)
@@ -17,27 +17,60 @@
 // add a method to add primitives to metadata
 %inline %{
-psBool psMetadataAddStr(psMetadata* md, psS32 where, const char* name, const char* comment, const char* value) {
+psBool psMetadataAddStr(psMetadata* md, psS32 where, const char* name, 
+const char* comment, const char* value) {
     return psMetadataAdd(md,where,name,PS_TYPE_PTR, PS_META_STR,comment,value);
 }
-psBool psMetadataAddF32(psMetadata* md, psS32 where, const char* name, const char* comment, psF32 value) {
+psBool psMetadataAddF32(psMetadata* md,
+                        psS32 where,
+                        const char* name,
+                        const char* comment,
+                        psF32 value)
+{
     return psMetadataAdd(md,where,name,PS_TYPE_F32, PS_META_PRIMITIVE,comment,value);
 }
-psBool psMetadataAddF64(psMetadata* md, psS32 where, const char* name, const char* comment, psF64 value) {
+
+psBool psMetadataAddF64(psMetadata* md,
+                        psS32 where,
+                        const char* name,
+                        const char* comment,
+                        psF64 value)
+{
     return psMetadataAdd(md,where,name,PS_TYPE_F64, PS_META_PRIMITIVE,comment,value);
 }
-psBool psMetadataAddS32(psMetadata* md, psS32 where, const char* name, const char* comment, psS32 value) {
+
+psBool psMetadataAddS32(psMetadata* md,
+                        psS32 where,
+                        const char* name,
+                        const char* comment,
+                        psS32 value)
+{
     return psMetadataAdd(md,where,name,PS_TYPE_S32, PS_META_PRIMITIVE,comment,value);
 }
 
-psMetadataItem* psMetadataItemAllocStr(const char* name, const char* comment, const char* value) {
+psMetadataItem* psMetadataItemAllocStr(const char* name,
+                                       const char* comment,
+                                       const char* value)
+{
     return psMetadataItemAlloc(name, PS_TYPE_PTR, PS_META_STR, comment, value);
 }
-psMetadataItem* psMetadataItemAllocF32(const char* name, const char* comment, psF32 value) {
+
+psMetadataItem* psMetadataItemAllocF32(const char* name,
+                                       const char* comment,
+                                       psF32 value)
+{
     return psMetadataItemAlloc(name, PS_TYPE_F32, PS_META_PRIMITIVE, comment, value);
 }
-psMetadataItem* psMetadataItemAllocF64(const char* name, const char* comment, psF64 value) {
+
+psMetadataItem* psMetadataItemAllocF64(const char* name,
+                                       const char* comment,
+                                       psF64 value)
+{
     return psMetadataItemAlloc(name, PS_TYPE_F64, PS_META_PRIMITIVE, comment, value);
 }
-psMetadataItem* psMetadataItemAllocS32(const char* name, const char* comment, psS32 value) {
+
+psMetadataItem* psMetadataItemAllocS32(const char* name,
+                                       const char* comment,
+                                       psS32 value)
+{
     return psMetadataItemAlloc(name, PS_TYPE_S32, PS_META_PRIMITIVE, comment, value);
 }
Index: trunk/psLib/src/astronomy/psCoord.c
===================================================================
--- trunk/psLib/src/astronomy/psCoord.c	(revision 3169)
+++ trunk/psLib/src/astronomy/psCoord.c	(revision 3182)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:45:06 $
+*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-10 02:36:41 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -267,9 +267,9 @@
 {
     while (angle < FLT_EPSILON) {
-        angle+=M_PI;
-    }
-
-    while (angle >= M_PI) {
-        angle-=M_PI;
+        angle+=PS_PI;
+    }
+
+    while (angle >= PS_PI) {
+        angle-=PS_PI;
     }
     return(angle);
@@ -547,5 +547,5 @@
         R = PS_SQRT_F32((coord->x * coord->x) + (coord->y * coord->y));
         tmp->d = atan2(-coord->y, coord->x);
-        tmp->r = acos((R * M_PI) / 180.0);
+        tmp->r = acos((R * PS_PI) / 180.0);
 
     } else if (projection->type == PS_PROJ_CAR) {
@@ -555,14 +555,14 @@
     } else if (projection->type == PS_PROJ_MER) {
         tmp->d = coord->x;
-        tmp->r = (2.0 * atan(exp((coord->y * M_PI / 180.0)))) - 180.0;
+        tmp->r = (2.0 * atan(exp((coord->y * PS_PI / 180.0)))) - 180.0;
 
     } else if (projection->type == PS_PROJ_AIT) {
-        chu1 = (coord->x * M_PI) / 720.0;
+        chu1 = (coord->x * PS_PI) / 720.0;
         chu1 *= chu1;
-        chu2 = (coord->y * M_PI) / 360.0;
+        chu2 = (coord->y * PS_PI) / 360.0;
         chu2 *= chu2;
         chu = PS_SQRT_F32(1.0 - chu1 - chu2);
-        tmp->d = 2.0 * atan2((2.0 * chu * chu) - 1.0, (coord->x * chu * M_PI) / 360.0);
-        tmp->r = asin((coord->y * chu * M_PI) / 180.0);
+        tmp->d = 2.0 * atan2((2.0 * chu * chu) - 1.0, (coord->x * chu * PS_PI) / 360.0);
+        tmp->r = asin((coord->y * chu * PS_PI) / 180.0);
 
     } else if (projection->type == PS_PROJ_PAR) {
@@ -640,6 +640,6 @@
         // Wrap these to an acceptable range.  This assumes that all
         // angles are in radians.
-        tmp->r = fmod(tmp->r, 2*M_PI);
-        tmp->d = fmod(tmp->d, 2*M_PI);
+        tmp->r = fmod(tmp->r, 2*PS_PI);
+        tmp->d = fmod(tmp->d, 2*PS_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;
@@ -731,7 +731,7 @@
         tmp = (psSphere* ) psAlloc(sizeof(psSphere));
         tmp->r = position->r + tmpR;
-        tmp->r = fmod(tmp->r, 2.0*M_PI);
+        tmp->r = fmod(tmp->r, 2.0*PS_PI);
         tmp->d = position->d + tmpD;
-        tmp->d = fmod(tmp->d, 2.0*M_PI);
+        tmp->d = fmod(tmp->d, 2.0*PS_PI);
         tmp->rErr = 0.0;
         tmp->dErr = 0.0;
Index: trunk/psLib/src/astronomy/psTime.c
===================================================================
--- trunk/psLib/src/astronomy/psTime.c	(revision 3169)
+++ trunk/psLib/src/astronomy/psTime.c	(revision 3182)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:45:06 $
+ *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:41 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43,8 +43,8 @@
 
 /** Two times pi with double precision accuracy */
-#define TWOPI (2.0*M_PI)
+#define TWOPI (2.0*PS_PI)
 
 /** Conversion from radians to degrees */
-#define R2DEG = (180.0/M_PI)
+#define R2DEG = (180.0/PS_PI)
 
                 /** Maximum length of time string */
@@ -548,5 +548,5 @@
 
         t = 2000.0 + (mjd - 51544.03)/365.2422;
-        dut2ut1 = 0.022*sin(TWOPI*t) - 0.012*cos(TWOPI*t) - 0.006*sin(4.0*M_PI*t) + 0.007*cos(4.0*M_PI*t);
+        dut2ut1 = 0.022*sin(TWOPI*t) - 0.012*cos(TWOPI*t) - 0.006*sin(4.0*PS_PI*t) + 0.007*cos(4.0*PS_PI*t);
         result = dut->data.F64[0] + dut->data.F64[1]*(mjd - dut->data.F64[2]) - dut2ut1;
 
@@ -677,8 +677,8 @@
     }
 
-    // Create output sphere and convert arcsec to radians (i.e. x/60/60*M_PI/180)
+    // Create output sphere and convert arcsec to radians (i.e. x/60/60*PS_PI/180)
     output = psAlloc(sizeof(psSphere));
-    output->r = x * M_PI / 648000.0;
-    output->d = y * M_PI / 648000.0;
+    output->r = x * PS_PI / 648000.0;
+    output->d = y * PS_PI / 648000.0;
 
     return output;