diff options
| author | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-06-02 23:42:13 +0000 |
|---|---|---|
| committer | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-06-02 23:42:13 +0000 |
| commit | e81809849a4bae494032c4859467026f14be7aed (patch) | |
| tree | 7608c8c56b66a1eb53d29fad666d26d694c6d589 /scribus/plugins | |
| parent | 8992ca57baa85fa41bb6566422fa53da156ed1a7 (diff) | |
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/plugins')
4 files changed, 4 insertions, 4 deletions
diff --git a/scribus/plugins/colorwheel/colorwheelwidget.cpp b/scribus/plugins/colorwheel/colorwheelwidget.cpp index ee6077d..26b97ea 100644 --- a/scribus/plugins/colorwheel/colorwheelwidget.cpp +++ b/scribus/plugins/colorwheel/colorwheelwidget.cpp @@ -7,7 +7,7 @@ for which a new license (GPL+exception) is in place. #include "colorwheelwidget.h" -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES) #define _USE_MATH_DEFINES #endif #include <cmath> diff --git a/scribus/plugins/import/xfig/importxfig.cpp b/scribus/plugins/import/xfig/importxfig.cpp index 67fe20f..e6eb5b1 100644 --- a/scribus/plugins/import/xfig/importxfig.cpp +++ b/scribus/plugins/import/xfig/importxfig.cpp @@ -15,7 +15,7 @@ for which a new license (GPL+exception) is in place. #include <QStack>
#include <QDebug>
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
#define _USE_MATH_DEFINES
#endif
#include <cmath>
diff --git a/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h b/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h index b0f7b48..523b1d0 100644 --- a/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h +++ b/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.h @@ -31,7 +31,7 @@ for which a new license (GPL+exception) is in place. #include "scplugin.h" #include "selection.h" -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES) #define _USE_MATH_DEFINES #endif diff --git a/scribus/plugins/tools/transform/transformdialog.cpp b/scribus/plugins/tools/transform/transformdialog.cpp index ee4df56..4c05419 100644 --- a/scribus/plugins/tools/transform/transformdialog.cpp +++ b/scribus/plugins/tools/transform/transformdialog.cpp @@ -30,7 +30,7 @@ for which a new license (GPL+exception) is in place. #include "commonstrings.h" #include "units.h" -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES) #define _USE_MATH_DEFINES #endif #include <cmath> |