Index: trunk/psLib/src/dataManip/psConstants.h
===================================================================
--- trunk/psLib/src/dataManip/psConstants.h	(revision 4108)
+++ trunk/psLib/src/dataManip/psConstants.h	(revision 4162)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-04 00:49:48 $
+ *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -45,6 +45,5 @@
 #define M_1_PI 0.3183098861837906715377675267450287  /* 1/pi */
 #define M_2_PI 0.6366197723675813430755350534900574  /* 2/pi */
-#endif
-#define PS_PI   3.1415926535897932384626433832795029  /* pi */
+#endif // #ifndef M_PI
 
 #define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0)
@@ -699,15 +698,9 @@
  *****************************************************************************/
 #define PS_MAX(A, B) \
-(((A) > (B)) ? (A) : (B)) \
+(((A) > (B)) ? (A) : (B))
 
 #define PS_MIN(A, B) \
-(((A) < (B)) ? (A) : (B)) \
+(((A) < (B)) ? (A) : (B))
 
 #define PS_SQR(A) \
-((A) * (A)) \
-
-#ifdef DARWIN
-#define PS_SQRT_F32(A) ((float) sqrt(A))
-#else
-#define PS_SQRT_F32(A) (sqrtf(A))
-#endif
+((A) * (A))