You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/08/13 20:27:13 UTC
svn commit: r1372535 - in /incubator/ooo/trunk/main/pyuno:
inc/pyuno/pyuno.hxx source/module/pyuno_impl.hxx
Author: pfg
Date: Mon Aug 13 18:27:13 2012
New Revision: 1372535
URL: http://svn.apache.org/viewvc?rev=1372535&view=rev
Log:
Move old Python compatibility to a better place.
Modified:
incubator/ooo/trunk/main/pyuno/inc/pyuno/pyuno.hxx
incubator/ooo/trunk/main/pyuno/source/module/pyuno_impl.hxx
Modified: incubator/ooo/trunk/main/pyuno/inc/pyuno/pyuno.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pyuno/inc/pyuno/pyuno.hxx?rev=1372535&r1=1372534&r2=1372535&view=diff
==============================================================================
--- incubator/ooo/trunk/main/pyuno/inc/pyuno/pyuno.hxx (original)
+++ incubator/ooo/trunk/main/pyuno/inc/pyuno/pyuno.hxx Mon Aug 13 18:27:13 2012
@@ -37,6 +37,12 @@
#pragma warning(pop)
#endif
#endif // #ifdef Py_PYTHON_H
+// Compatibility for older system Python (2.6 and previous)
+#ifndef PyVarObject_HEAD_INIT
+#define PyVarObject_HEAD_INIT(type, size) \
+ PyObject_HEAD_INIT(type) size,
+#endif
+
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/script/CannotConvertException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
Modified: incubator/ooo/trunk/main/pyuno/source/module/pyuno_impl.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pyuno/source/module/pyuno_impl.hxx?rev=1372535&r1=1372534&r2=1372535&view=diff
==============================================================================
--- incubator/ooo/trunk/main/pyuno/source/module/pyuno_impl.hxx (original)
+++ incubator/ooo/trunk/main/pyuno/source/module/pyuno_impl.hxx Mon Aug 13 18:27:13 2012
@@ -43,12 +43,6 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weakref.hxx>
-// Compatibility of older versions of Python
-#ifndef PyVarObject_HEAD_INIT
-#define PyVarObject_HEAD_INIT(type, size) \
- PyObject_HEAD_INIT(type) size,
-#endif
-
namespace pyuno
{