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/27 05:19:53 UTC
svn commit: r1377558 - in
/incubator/ooo/symphony/trunk/main/pyuno/inc/pyuno: ./ pyuno.hxx
Author: pfg
Date: Mon Aug 27 03:19:53 2012
New Revision: 1377558
URL: http://svn.apache.org/viewvc?rev=1377558&view=rev
Log:
Merge r1372535: Compatibility for older python.
Modified:
incubator/ooo/symphony/trunk/main/pyuno/inc/pyuno/ (props changed)
incubator/ooo/symphony/trunk/main/pyuno/inc/pyuno/pyuno.hxx
Propchange: incubator/ooo/symphony/trunk/main/pyuno/inc/pyuno/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 27 03:19:53 2012
@@ -0,0 +1 @@
+/incubator/ooo/trunk/main/pyuno/inc/pyuno:1366479,1366577,1367858,1372535
Modified: incubator/ooo/symphony/trunk/main/pyuno/inc/pyuno/pyuno.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/symphony/trunk/main/pyuno/inc/pyuno/pyuno.hxx?rev=1377558&r1=1377557&r2=1377558&view=diff
==============================================================================
--- incubator/ooo/symphony/trunk/main/pyuno/inc/pyuno/pyuno.hxx (original)
+++ incubator/ooo/symphony/trunk/main/pyuno/inc/pyuno/pyuno.hxx Mon Aug 27 03:19:53 2012
@@ -16,6 +16,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>