Changeset 3884 for trunk/psLib/src/math/psConstants.h

Timestamp:

May 11, 2005, 12:02:16 PM (21 years ago)

Author:

desonia

Message:

changed PS_PI* to M_PI*.

File:

• trunk/psLib/src/math/psConstants.h (modified) (3 diffs)

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-11 02:29:39 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-11 22:02:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
  */
 
+#include<math.h> // for M_PI
+
 /*****************************************************************************
 These constants are used by various functions in the psLib.
@@ -31 +33 @@
 These are common mathimatical constants used by various functions in the psLib.
  *****************************************************************************/
-#define PS_PI   3.1415926535897932384626433832795029  /* pi */
-#define PS_PI_2 1.5707963267948966192313216916397514  /* pi/2 */
-#define PS_PI_4 0.7853981633974483096156608458198757  /* pi/4 */
-#define PS_1_PI 0.3183098861837906715377675267450287  /* 1/pi */
-#define PS_2_PI 0.6366197723675813430755350534900574  /* 2/pi */
-
-#define DEG_TO_RAD(DEGREES) ((DEGREES) * PS_PI / 180.0)
-#define MIN_TO_RAD(MINUTES) ((MINUTES) * PS_PI / (180.0 * 60.0))
-#define SEC_TO_RAD(SECONDS) ((SECONDS) * PS_PI / (180.0 * 60.0 * 60.0))
-#define RAD_TO_DEG(RADIANS) ((RADIANS) * 180.0 / PS_PI)
-#define RAD_TO_MIN(RADIANS) ((RADIANS) * 180.0 * 60.0 / PS_PI)
-#define RAD_TO_SEC(RADIANS) ((RADIANS) * 180.0 * 60.0 * 60.0 / PS_PI)
+#ifndef M_PI
+#define M_PI   3.1415926535897932384626433832795029  /* pi */
+#define M_PI_2 1.5707963267948966192313216916397514  /* pi/2 */
+#define M_PI_4 0.7853981633974483096156608458198757  /* pi/4 */
+#define M_1_PI 0.3183098861837906715377675267450287  /* 1/pi */
+#define M_2_PI 0.6366197723675813430755350534900574  /* 2/pi */
+#endif
+
+#define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0)
+#define MIN_TO_RAD(MINUTES) ((MINUTES) * M_PI / (180.0 * 60.0))
+#define SEC_TO_RAD(SECONDS) ((SECONDS) * M_PI / (180.0 * 60.0 * 60.0))
+#define RAD_TO_DEG(RADIANS) ((RADIANS) * 180.0 / M_PI)
+#define RAD_TO_MIN(RADIANS) ((RADIANS) * 180.0 * 60.0 / M_PI)
+#define RAD_TO_SEC(RADIANS) ((RADIANS) * 180.0 * 60.0 * 60.0 / M_PI)
 
 /*****************************************************************************