diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 10:00:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-27 09:36:49 +0100 |
| commit | d684a3cad91a81480b8856a1bffc24577e986866 (patch) | |
| tree | 976de2c4853042c40bcf35ab55e4d757f24ca1bc | |
| parent | fdo#39445 writing out tools/fsys.hxx (rsc) (diff) | |
| download | core-d684a3cad91a81480b8856a1bffc24577e986866.tar.gz core-d684a3cad91a81480b8856a1bffc24577e986866.zip | |
_USE_MATH_DEFINES is already taken care of by sal/config.h
Change-Id: Ib0dab05534c34eb407f3acee3b4a3638a36bdddc
| -rw-r--r-- | basebmp/test/bmpdemo.cxx | 5 | ||||
| -rw-r--r-- | comphelper/inc/comphelper/stl_types.hxx | 8 | ||||
| -rw-r--r-- | extensions/source/scanner/grid.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 2 |
6 files changed, 11 insertions, 14 deletions
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 1382cc57a5ba..ae24c65bd22d 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -17,9 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _USE_MATH_DEFINES -#define _USE_MATH_DEFINES // needed by Visual C++ for math constants -#endif +#include "sal/config.h" + #include <math.h> #include <comphelper/processfactory.hxx> diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx index 4232f087ef9d..1292f698a54a 100644 --- a/comphelper/inc/comphelper/stl_types.hxx +++ b/comphelper/inc/comphelper/stl_types.hxx @@ -19,18 +19,14 @@ #ifndef _COMPHELPER_STLTYPES_HXX_ #define _COMPHELPER_STLTYPES_HXX_ +#include "sal/config.h" + #include <vector> #include <map> #include <stack> #include <set> -#ifdef _MSC_VER -# ifndef _USE_MATH_DEFINES -# define _USE_MATH_DEFINES // needed by Visual C++ for math constants -# endif -#endif - #include <math.h> // prevent conflict between exception and std::exception #include <functional> diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 93366b9f292d..dc017f0c3628 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + #include <grid.hrc> #include <cstdio> #include <math.h> // for M_LN10 and M_E -#define _USE_MATH_DEFINES #include <cmath> -#undef _USE_MATH_DEFINES #include <grid.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 40e6c0c7bc4c..76dcf8d1f07e 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + #include <com/sun/star/lang/XComponent.hpp> -#define _USE_MATH_DEFINES #include <math.h> #include <vcl/metaact.hxx> // for TakeContour #include <vcl/cvtsvm.hxx> diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 70ccd943591a..d49f5fac0794 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define _USE_MATH_DEFINES +#include "sal/config.h" + #include <math.h> #include <algorithm> diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 9df49c42f69b..10cde2e4636d 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" #include <cstdio> -#define _USE_MATH_DEFINES #include <math.h> #include <sal/alloca.h> |