[Libreoffice-commits] .: pyuno/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sat May 7 17:41:23 PDT 2011
pyuno/source/module/pyuno_impl.hxx | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 68246fdd468c35195179fc5dbd6e0db83a9c1ad0
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat May 7 17:41:06 2011 -0700
PyVarObject_HEAD_INIT() isn't defined in Python 2.5-
Mac OS X is still being compiled vs 2.3
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index d0a0bba..ff6ca87 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,6 +30,11 @@
#include <Python.h>
+//Must define PyVarObject_HEAD_INIT for Python 2.5 or older
+#ifndef PyVarObject_HEAD_INIT
+#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
+#endif
+
#include <pyuno/pyuno.hxx>
#include <boost/unordered_map.hpp>
@@ -177,7 +182,7 @@ PyRef ustring2PyUnicode( const rtl::OUString &source );
PyRef ustring2PyString( const ::rtl::OUString & source );
rtl::OUString pyString2ustring( PyObject *str );
-
+
PyRef AnyToPyObject (const com::sun::star::uno::Any & a, const Runtime &r )
throw ( com::sun::star::uno::RuntimeException );
@@ -286,7 +291,7 @@ public:
PyRef getWrappedObject() { return mWrappedObject; }
com::sun::star::uno::Sequence< com::sun::star::uno::Type > getWrappedTypes() { return mTypes; }
virtual ~Adapter();
-
+
// XInvocation
virtual com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess >
SAL_CALL getIntrospection( ) throw (::com::sun::star::uno::RuntimeException);
More information about the Libreoffice-commits
mailing list