From b45d97ae4902fbae26f66e33526f868f32a503ce Mon Sep 17 00:00:00 2001
From: Christian Tismer <tismer@stackless.com>
Date: Wed, 25 Jul 2018 14:36:26 +0200
Subject: Fix Some Minor Limited API Omissions And Quirks

Some formatting was not ok, some ordering of methods
was not perfect, some code vanished, bufferprocs had a bad
filename, and descrobject.h did not need a patch, anymore
since things were solved in signature.cpp .

Task-number: PYSIDE-560
Change-Id: Ibd1bedf0763ebb3fbbfd33a8e7cff4b5af6fab5e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 sources/shiboken2/libshiboken/pep384impl.h | 33 +++++++++---------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

(limited to 'sources/shiboken2/libshiboken/pep384impl.h')

diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h
index 643714f04..d06947f06 100644
--- a/sources/shiboken2/libshiboken/pep384impl.h
+++ b/sources/shiboken2/libshiboken/pep384impl.h
@@ -53,7 +53,7 @@ extern "C"
 
 // Extracted into bufferprocs27.h
 #ifdef Py_LIMITED_API
-#include "bufferprocs27.h"
+#include "bufferprocs_py37.h"
 #endif
 
 /*****************************************************************************
@@ -136,11 +136,6 @@ typedef struct _typeobject {
 LIBSHIBOKEN_API int PyIndex_Check(PyObject *obj);
 #endif
 
-#undef PyObject_IS_GC
-#define PyObject_IS_GC(o) (PyType_IS_GC(Py_TYPE(o)) && \
-    ( Py_TYPE(o)->tp_is_gc == NULL || \
-      Py_TYPE(o)->tp_is_gc(o) ))
-
 #endif // Py_LIMITED_API
 
 struct SbkObjectTypePrivate;
@@ -148,22 +143,22 @@ struct PySideQFlagsTypePrivate;
 struct _SbkGenericTypePrivate;
 
 #define PepHeapType_SIZE \
-    (reinterpret_cast<PyTypeObject*>(&PyType_Type)->tp_basicsize)
+    (reinterpret_cast<PyTypeObject *>(&PyType_Type)->tp_basicsize)
 
 #define _genericTypeExtender(etype) \
-    (reinterpret_cast<char*>(etype) + PepHeapType_SIZE)
+    (reinterpret_cast<char *>(etype) + PepHeapType_SIZE)
 
 #define PepType_SOTP(etype) \
-    (*reinterpret_cast<SbkObjectTypePrivate**>(_genericTypeExtender(etype)))
+    (*reinterpret_cast<SbkObjectTypePrivate **>(_genericTypeExtender(etype)))
 
 #define PepType_SETP(etype) \
-    (reinterpret_cast<SbkEnumTypePrivate*>(_genericTypeExtender(etype)))
+    (reinterpret_cast<SbkEnumTypePrivate *>(_genericTypeExtender(etype)))
 
 #define PepType_PFTP(etype) \
-    (reinterpret_cast<PySideQFlagsTypePrivate*>(_genericTypeExtender(etype)))
+    (reinterpret_cast<PySideQFlagsTypePrivate *>(_genericTypeExtender(etype)))
 
 #define PepType_SGTP(etype) \
-    (reinterpret_cast<_SbkGenericTypePrivate*>(_genericTypeExtender(etype)))
+    (reinterpret_cast<_SbkGenericTypePrivate *>(_genericTypeExtender(etype)))
 
 // functions used everywhere
 LIBSHIBOKEN_API const char *PepType_GetNameStr(PyTypeObject *type);
@@ -237,8 +232,8 @@ LIBSHIBOKEN_API char *_PepUnicode_AsString(PyObject *);
  */
 #ifdef Py_LIMITED_API
 #define PyTuple_GET_ITEM(op, i)     PyTuple_GetItem((PyObject *)op, i)
-#define PyTuple_GET_SIZE(op)        PyTuple_Size((PyObject *)op)
 #define PyTuple_SET_ITEM(op, i, v)  PyTuple_SetItem(op, i, v)
+#define PyTuple_GET_SIZE(op)        PyTuple_Size((PyObject *)op)
 #endif
 
 /*****************************************************************************
@@ -270,15 +265,6 @@ typedef struct _pycfunc PyCFunctionObject;
 #define PepCFunction_GET_NAMESTR(func)        ((func)->m_ml->ml_name)
 #endif
 
-/*****************************************************************************
- *
- * RESOLVED: descrobject.h
- *
- */
-#ifdef Py_LIMITED_API
-typedef struct _methoddescr PyMethodDescrObject;
-#endif
-
 /*****************************************************************************
  *
  * RESOLVED: pythonrun.h
@@ -380,7 +366,8 @@ LIBSHIBOKEN_API PyObject *PyMethod_Self(PyObject *);
  */
 #ifdef Py_LIMITED_API
 /* Bytecode object */
-    // we have to grab the code object from python
+
+// we have to grab the code object from python
 typedef struct _code PyCodeObject;
 
 LIBSHIBOKEN_API int PepCode_Get(PyCodeObject *co, const char *name);
-- 
cgit v1.2.3