Changeset 64330 in vbox for trunk/src

Timestamp:

Oct 20, 2016 12:11:23 PM (8 years ago)

Author:

vboxsync

Message:

libs/xpcom/python: fixes when compiling against Python 3.2 or newer

Location:

trunk/src/libs/xpcom18a4/python/src

Files:

• PyIID.cpp (modified) (1 diff)
• PyXPCOM.h (modified) (2 diffs)
• TypeObject.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/python/src/PyIID.cpp

@@ -319 +319 @@
 }
 
+#if PY_VERSION_HEX >= 0x03020000
+/* static */Py_hash_t
+Py_nsIID::PyTypeMethod_hash(PyObject *self)
+#else
 /* static */long
 Py_nsIID::PyTypeMethod_hash(PyObject *self)
+#endif
 {
         const nsIID &iid = ((Py_nsIID *)self)->m_iid;
 
+#if PY_VERSION_HEX >= 0x03020000
+        Py_hash_t ret = iid.m0 + iid.m1 + iid.m2;
+#else
         long ret = iid.m0 + iid.m1 + iid.m2;
+#endif
         for (int i=0;i<7;i++)
                 ret += iid.m3[i];

trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h

@@ -287 +287 @@
         static int Py_cmp(PyObject *ob1, PyObject *ob2);
         static PyObject *Py_richcmp(PyObject *ob1, PyObject *ob2, int op);
+#if PY_VERSION_HEX >= 0x03020000
+        static Py_hash_t Py_hash(PyObject *self);
+#else
         static long Py_hash(PyObject *self);
+#endif
 };
 
@@ -443 +447 @@
         static PyObject *PyTypeMethod_richcompare(PyObject *self, PyObject *ob, int op);
         static PyObject *PyTypeMethod_repr(PyObject *self);
+#if PY_VERSION_HEX >= 0x03020000
+        static Py_hash_t PyTypeMethod_hash(PyObject *self);
+#else
         static long PyTypeMethod_hash(PyObject *self);
+#endif
         static PyObject *PyTypeMethod_str(PyObject *self);
         static void PyTypeMethod_dealloc(PyObject *self);

trunk/src/libs/xpcom18a4/python/src/TypeObject.cpp

@@ -156 +156 @@
 
 // @pymethod int|Py_nsISupports|__hash__|Implement a hash-code for the XPCOM object using XPCOM identity rules.
+#if PY_VERSION_HEX >= 0x03020000
+/*static*/Py_hash_t PyXPCOM_TypeObject::Py_hash(PyObject *self)
+#else
 /*static*/long PyXPCOM_TypeObject::Py_hash(PyObject *self)
+#endif
 {
         // We always return the value of the nsISupports *.
@@ -162 +166 @@
         if (!Py_nsISupports::InterfaceFromPyObject(self, NS_GET_IID(nsISupports), &pUnkThis, PR_FALSE))
                 return -1;
+#if PY_VERSION_HEX >= 0x03020000
+        Py_hash_t ret = _Py_HashPointer(pUnkThis);
+#else
         long ret = _Py_HashPointer(pUnkThis);
+#endif
         pUnkThis->Release();
         return ret;