guarded M_PI declaration

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 7a023ff885da26a9bce080e2c9658e5d33ed3767..9460b8730424889eba4ef3104e8157281e1fa4ba 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -46,8 +46,10 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
 #if !defined( __DARWIN__ ) || defined(__MWERKS__)
+#ifndef M_PI
 const double M_PI = 3.14159265358979 ;
 #endif
+#endif
 const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 7a023ff885da26a9bce080e2c9658e5d33ed3767..9460b8730424889eba4ef3104e8157281e1fa4ba 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -46,8 +46,10 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
 #if !defined( __DARWIN__ ) || defined(__MWERKS__)
+#ifndef M_PI
 const double M_PI = 3.14159265358979 ;
 #endif
+#endif
 const double RAD2DEG  = 180.0 / M_PI;
 const short kEmulatedMode = -1 ;
 const short kUnsupportedMode = -2 ;