summaryrefslogtreecommitdiffstats
path: root/scribus/canvas.cpp
diff options
context:
space:
mode:
authorjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-06-02 23:42:13 +0000
committerjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-06-02 23:42:13 +0000
commite81809849a4bae494032c4859467026f14be7aed (patch)
tree7608c8c56b66a1eb53d29fad666d26d694c6d589 /scribus/canvas.cpp
parent8992ca57baa85fa41bb6566422fa53da156ed1a7 (diff)
downloadscribus-e81809849a4bae494032c4859467026f14be7aed.tar.gz
scribus-e81809849a4bae494032c4859467026f14be7aed.tar.xz
scribus-e81809849a4bae494032c4859467026f14be7aed.zip
msvc project update : more modifications to ease transition to msvc 2010/msvc 2012
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17538 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/canvas.cpp')
-rw-r--r--scribus/canvas.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scribus/canvas.cpp b/scribus/canvas.cpp
index 6156c0d..e3c5d47 100644
--- a/scribus/canvas.cpp
+++ b/scribus/canvas.cpp
@@ -13,7 +13,7 @@
* *
***************************************************************************/
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
#define _USE_MATH_DEFINES
#endif
#include <cmath>