From 4a6c6d2f86db151b757dcf2bc21c4e6798a20a9b Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 16 Sep 2020 15:52:07 -0700
Subject: [PATCH] update siplib

---
 sip/siplib/qtlib.c  |  4 ++--
 sip/siplib/sip.h    |  4 ++--
 sip/siplib/siplib.c | 10 ++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sip/siplib/qtlib.c b/sip/siplib/qtlib.c
index 6f7f7481..e166529f 100644
--- a/sip/siplib/qtlib.c
+++ b/sip/siplib/qtlib.c
@@ -2,7 +2,7 @@
  * The SIP library code that implements the interface to the optional module
  * supplied Qt support.
  *
- * Copyright (c) 2016 Riverbank Computing Limited <info@riverbankcomputing.com>
+ * Copyright (c) 2020 Riverbank Computing Limited <info@riverbankcomputing.com>
  *
  * This file is part of SIP.
  *
@@ -218,7 +218,7 @@ PyObject *sip_api_invoke_slot_ex(const sipSlot *slot, PyObject *sigargs,
     {
         PyObject *nsa, *xtype, *xvalue, *xtb, *resobj;
 
-        if ((resobj = PyEval_CallObject(sfunc, sa)) != NULL)
+        if ((resobj = PyObject_CallObject(sfunc, sa)) != NULL)
         {
             Py_DECREF(sfunc);
             Py_XDECREF(sref);
diff --git a/sip/siplib/sip.h b/sip/siplib/sip.h
index 5dc022ee..ad903637 100644
--- a/sip/siplib/sip.h
+++ b/sip/siplib/sip.h
@@ -54,8 +54,8 @@ extern "C" {
 /*
  * Define the SIP version number.
  */
-#define SIP_VERSION         0x041317
-#define SIP_VERSION_STR     "4.19.23"
+#define SIP_VERSION         0x041318
+#define SIP_VERSION_STR     "4.19.24"
 
 
 /*
diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c
index a31ddbec..db52b68b 100644
--- a/sip/siplib/siplib.c
+++ b/sip/siplib/siplib.c
@@ -297,6 +297,9 @@ static sipWrapperType sipWrapper_Type = {
         0,                  /* ht_qualname */
         0,                  /* ht_cached_keys */
 #endif
+#if PY_VERSION_HEX >= 0x03090000
+        0,                  /* ht_module */
+#endif
 #if !defined(STACKLESS)
     },
 #endif
@@ -1128,7 +1131,7 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void)
 #error "Add support for capsule variables"
 #endif
 
-#ifdef WITH_THREAD
+#if PY_VERSION_HEX < 0x03070000 && defined(WITH_THREAD)
     PyEval_InitThreads();
 #endif
 
@@ -2337,7 +2340,7 @@ static PyObject *call_method(PyObject *method, const char *fmt, va_list va)
         return NULL;
 
     if (buildObject(args, fmt, va) != NULL)
-        res = PyEval_CallObject(method, args);
+        res = PyObject_CallObject(method, args);
     else
         res = NULL;
 
@@ -11679,6 +11682,9 @@ sipWrapperType sipSimpleWrapper_Type = {
         0,                  /* ht_qualname */
         0,                  /* ht_cached_keys */
 #endif
+#if PY_VERSION_HEX >= 0x03090000
+        0,                  /* ht_module */
+#endif
 #if !defined(STACKLESS)
     },
 #endif