[Libreoffice-commits] .: pyuno/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Dec 21 08:40:30 PST 2012


 pyuno/source/module/pyuno_impl.hxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 781548472b9ac4609ecfff5918444564cbb75500
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Dec 21 18:27:57 2012 +0200

    VS2012 WaE: C4211: nonstandard extension used : redefined extern to static
    
    Some screwup with hypot(). As a workaround, include <math.h> early.
    
    Change-Id: Ic8c6abc45f8502097c6b6b619108d50ea3c22392

diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index e794c9d..6231bad 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


More information about the Libreoffice-commits mailing list