diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-18 10:28:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-18 10:28:51 +0000 |
| commit | 2f53e59ecb280435f3179cd610f3146a445fe601 (patch) | |
| tree | 3bb9818127af57e85054a8a3e15bffb06f0d98fe /tools | |
| parent | 2a796606209518c5da3bf66435e39267a6f35a11 (diff) | |
#i90810# Do not include cmath for MS .Net2003 compiler.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/generic/line.cxx | 6 | ||||
| -rw-r--r-- | tools/source/generic/poly2.cxx | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/tools/source/generic/line.cxx b/tools/source/generic/line.cxx index 57b4c8d3fb61..e15cabe32a3e 100644 --- a/tools/source/generic/line.cxx +++ b/tools/source/generic/line.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: line.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -37,7 +37,11 @@ #include <tools/debug.hxx> #include <cstdlib> +#if defined(_MSC_VER) && (_MSC_VER <= 1310) +// Windows .Net2003 compiler: do not include cmath +#else #include <cmath> // std::sqrt +#endif #include <math.h> // hypot, doens't seem to live in std namespace everywhere inline long FRound( double fVal ) diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index 4dcfb510339e..d73570279027 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: poly2.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.21 $ * * This file is part of OpenOffice.org. * @@ -45,10 +45,6 @@ extern "C" #endif // HAVE_GPC_H } -/* -#include <cstring> -#include <cmath> -*/ #include <poly.h> #ifndef _POLY_HXX #include <tools/poly.hxx> @@ -63,7 +59,11 @@ extern "C" #include <basegfx/polygon/b2dpolypolygontools.hxx> #endif +#if defined(_MSC_VER) && (_MSC_VER <= 1310) +// Windows .Net2003 compiler: do not include cmath +#else #include <cmath> +#endif // --------------- // - PolyPolygon - |