--- src/common/global.h.orig	2004-04-29 17:30:45.000000000 -0700
+++ src/common/global.h	2004-04-29 17:33:40.000000000 -0700
@@ -47,6 +47,8 @@
 #ifndef GLOBAL_H
 #define	GLOBAL_H
 
+#include <math.h>
+
 // The Pixie version
 #define	VERSION_RELEASE	1
 #define	VERSION_BETA	3
@@ -54,21 +56,33 @@
 
 // Come constant definitions
 // Math constants
+#ifndef INFINITY
 #define	INFINITY							(float) 1e30
-#define	EPSILON								(float) 1e-6
+#endif
 
+#define	EPSILON								(float) 1e-6
 
 // The most famous number
 #ifndef PI
+#ifdef M_PI
+#define PI M_PI
+#else
 #define	PI									(float) 3.141592653589793238462643383279502884197169399375105820974944592308
+#endif
+#endif
+
+#ifndef DOUBLE_PI
+#ifdef M_PIl
+#define DOUBLE_PI M_PIl
+#else
 #define	DOUBLE_PI							3.141592653589793238462643383279502884197169399375105820974944592308
 #endif
+#endif
 
 // Logic constants
 #define	TRUE								1
 #define	FALSE								0
 
-
 // Misc Options and Attributes constants
 #ifdef min
 #undef min