Merge branch 'master' of https://github.com/JuliaLang/julia

halleysfifthinc · Jun 16, 2011 · 38e907f · 38e907f
2 parents f74b278 + 0d40ddb
commit 38e907f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/external/fdlibm/math_private.h b/external/fdlibm/math_private.h
@@ -19,7 +19,9 @@
 
 #include <sys/types.h>
 
+#ifndef M_PI
 #define M_PI 3.14159265358979323846 /* pi */
+#endif
 
 /* The original fdlibm code used statements like:
  n0 = ((*(int*)&one)>>29)^1; * index of high word *