summaryrefslogtreecommitdiff
path: root/pyuno
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-12-21 18:27:57 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-12-21 18:39:28 +0200
commit781548472b9ac4609ecfff5918444564cbb75500 (patch)
tree1e7c58a45d815ae3b24c7c5760d1db664793de96 /pyuno
parentd978085ab2ffb2380bacf01af42a06f7fbd3d179 (diff)
VS2012 WaE: C4211: nonstandard extension used : redefined extern to static
Some screwup with hypot(). As a workaround, include <math.h> early. Change-Id: Ic8c6abc45f8502097c6b6b619108d50ea3c22392
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/source/module/pyuno_impl.hxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index e794c9d40738..6231bade2165 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -19,6 +19,11 @@
#ifndef _PYUNO_IMPL_
#define _PYUNO_IMPL_
+#if defined(_MSC_VER) && (_MSC_VER >= 1700)
+// Workaround for some horrible hypot() mess
+#include <math.h>
+#endif
+
#include <Python.h>
//Must define PyVarObject_HEAD_INIT for Python 2.5 or older