Return-Path: X-Original-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C2C29D4F4 for ; Fri, 10 Aug 2012 19:21:55 +0000 (UTC) Received: (qmail 48578 invoked by uid 500); 10 Aug 2012 19:21:55 -0000 Delivered-To: apmail-incubator-ooo-dev-archive@incubator.apache.org Received: (qmail 48516 invoked by uid 500); 10 Aug 2012 19:21:55 -0000 Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-dev@incubator.apache.org Received: (qmail 48508 invoked by uid 99); 10 Aug 2012 19:21:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2012 19:21:55 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [79.98.78.37] (HELO janik.cz) (79.98.78.37) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Aug 2012 19:21:49 +0000 Received: from [10.0.0.100] (unknown [10.0.0.100]) by janik.cz (Server) with ESMTP id 96B5734E2C0; Fri, 10 Aug 2012 21:23:52 +0200 (CEST) Subject: Re: svn commit: r1367858 - in /incubator/ooo/trunk/main/pyuno/source/module: pyuno.cxx pyuno_callable.cxx pyuno_module.cxx pyuno_runtime.cxx Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=iso-8859-1 From: =?iso-8859-1?Q?Pavel_Jan=EDk?= In-Reply-To: <20120801043042.C7B2C23888FD@eris.apache.org> Date: Fri, 10 Aug 2012 21:21:26 +0200 Cc: ooo-dev@incubator.apache.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <20120801043042.C7B2C23888FD@eris.apache.org> To: pfg@apache.org X-Mailer: Apple Mail (2.1084) X-Virus-Checked: Checked by ClamAV on apache.org Hi, this commit makes pyuno uncompilable here on Mac OS X 10.6.8. Please = revert or fix. On Aug 1, 2012, at 6:30 AM, pfg@apache.org wrote: > Author: pfg > Date: Wed Aug 1 04:30:42 2012 > New Revision: 1367858 >=20 > URL: http://svn.apache.org/viewvc?rev=3D1367858&view=3Drev > Log: > pyuno: Replace PyObject_HEAD_INIT with PyVarObject_HEAD_INIT and add = some initial Python3 safeguards. >=20 > Modified: > incubator/ooo/trunk/main/pyuno/source/module/pyuno.cxx > incubator/ooo/trunk/main/pyuno/source/module/pyuno_callable.cxx > incubator/ooo/trunk/main/pyuno/source/module/pyuno_module.cxx > incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx >=20 > Modified: incubator/ooo/trunk/main/pyuno/source/module/pyuno.cxx > URL: = http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pyuno/source/module/= pyuno.cxx?rev=3D1367858&r1=3D1367857&r2=3D1367858&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- incubator/ooo/trunk/main/pyuno/source/module/pyuno.cxx (original) > +++ incubator/ooo/trunk/main/pyuno/source/module/pyuno.cxx Wed Aug 1 = 04:30:42 2012 > @@ -639,8 +639,7 @@ static int PyUNO_cmp( PyObject *self, Py >=20 > static PyTypeObject PyUNOType =3D > { > - PyObject_HEAD_INIT (&PyType_Type) > - 0, > + PyVarObject_HEAD_INIT(&PyType_Type, 0) > const_cast< char * >("pyuno"), > sizeof (PyUNO), > 0, >=20 > Modified: = incubator/ooo/trunk/main/pyuno/source/module/pyuno_callable.cxx > URL: = http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pyuno/source/module/= pyuno_callable.cxx?rev=3D1367858&r1=3D1367857&r2=3D1367858&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- incubator/ooo/trunk/main/pyuno/source/module/pyuno_callable.cxx = (original) > +++ incubator/ooo/trunk/main/pyuno/source/module/pyuno_callable.cxx = Wed Aug 1 04:30:42 2012 > @@ -191,8 +191,7 @@ PyObject* PyUNO_callable_call (PyObject* >=20 > static PyTypeObject PyUNO_callable_Type =3D > { > - PyObject_HEAD_INIT (&PyType_Type) > - 0, > + PyVarObject_HEAD_INIT(&PyType_Type, 0) > const_cast< char * >("PyUNO_callable"), > sizeof (PyUNO_callable), > 0, >=20 > Modified: = incubator/ooo/trunk/main/pyuno/source/module/pyuno_module.cxx > URL: = http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pyuno/source/module/= pyuno_module.cxx?rev=3D1367858&r1=3D1367857&r2=3D1367858&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- incubator/ooo/trunk/main/pyuno/source/module/pyuno_module.cxx = (original) > +++ incubator/ooo/trunk/main/pyuno/source/module/pyuno_module.cxx Wed = Aug 1 04:30:42 2012 > @@ -486,9 +486,18 @@ static PyObject *isInterface( PyObject * > { > PyObject *obj =3D PyTuple_GetItem( args, 0 ); > Runtime r; > +#if PY_MAJOR_VERSION >=3D 3 > + return PyLong_FromLong( isInterfaceClass( r, obj ) ); > +#else > return PyInt_FromLong( isInterfaceClass( r, obj ) ); > + > +#endif > } > +#if PY_MAJOR_VERSION >=3D 3 > + return PyLong_FromLong( 0 ); > +#else > return PyInt_FromLong( 0 ); > +#endif > } >=20 > static PyObject * generateUuid( PyObject *, PyObject * ) >=20 > Modified: = incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx > URL: = http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pyuno/source/module/= pyuno_runtime.cxx?rev=3D1367858&r1=3D1367857&r2=3D1367858&view=3Ddiff > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx = (original) > +++ incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx Wed = Aug 1 04:30:42 2012 > @@ -65,8 +65,7 @@ namespace pyuno >=20 > static PyTypeObject RuntimeImpl_Type =3D > { > - PyObject_HEAD_INIT (&PyType_Type) > - 0, > + PyVarObject_HEAD_INIT(&PyType_Type, 0) > const_cast< char * >("pyuno_runtime"), > sizeof (RuntimeImpl), > 0, > @@ -438,7 +437,11 @@ PyRef Runtime::any2PyObject (const Any & > { > sal_Int32 l =3D 0; > a >>=3D l; > +#if PY_MAJOR_VERSION >=3D 3 > + return PyRef( PyLong_FromLong (l), SAL_NO_ACQUIRE ); > +#else > return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE ); > +#endif > } > case typelib_TypeClass_UNSIGNED_LONG: > { >=20 >=20 --=20 Pavel Jan=EDk