From: | "Mike Gilbert (floppym)" <floppym@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-python/pycxx/files: pycxx-6.2.3-python-3.2-Py_hash_t.patch |
Date: | Fri, 23 Dec 2011 05:30:54 |
Message-Id: | 20111223053044.ACBDE2004C@flycatcher.gentoo.org |
1 | floppym 11/12/23 05:30:44 |
2 | |
3 | Added: pycxx-6.2.3-python-3.2-Py_hash_t.patch |
4 | Log: |
5 | Add patch to fix the hash_handler prototype under python-3.2. Should resolve bug 369329. |
6 | |
7 | (Portage version: 2.2.0_alpha81/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycxx/files/pycxx-6.2.3-python-3.2-Py_hash_t.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: pycxx-6.2.3-python-3.2-Py_hash_t.patch |
16 | =================================================================== |
17 | --- Src/Python3/cxx_extensions.cxx |
18 | +++ Src/Python3/cxx_extensions.cxx |
19 | @@ -225,7 +225,11 @@ |
20 | static PyObject *rich_compare_handler( PyObject *, PyObject *, int ); |
21 | static PyObject *repr_handler( PyObject * ); |
22 | static PyObject *str_handler( PyObject * ); |
23 | +#if PY_VERSION_HEX >= 0x03020000 |
24 | + static Py_hash_t hash_handler( PyObject * ); |
25 | +#else |
26 | static long hash_handler( PyObject * ); |
27 | +#endif |
28 | static PyObject *call_handler( PyObject *, PyObject *, PyObject * ); |
29 | static PyObject *iter_handler( PyObject * ); |
30 | static PyObject *iternext_handler( PyObject * ); |
31 | @@ -714,7 +718,11 @@ |
32 | } |
33 | } |
34 | |
35 | +#if PY_VERSION_HEX >= 0x03020000 |
36 | +extern "C" Py_hash_t hash_handler( PyObject *self ) |
37 | +#else |
38 | extern "C" long hash_handler( PyObject *self ) |
39 | +#endif |
40 | { |
41 | try |
42 | { |