From f55deff004c240bda1327f34dfca882f3b28e17b Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Jan 22 2019 14:17:28 +0000 Subject: Update Python 3.7 patch. --- diff --git a/python-pycxx-7.1.0-python37.patch b/python-pycxx-7.1.0-python37.patch index 2e1bd61..0639f8f 100644 --- a/python-pycxx-7.1.0-python37.patch +++ b/python-pycxx-7.1.0-python37.patch @@ -1,48 +1,22 @@ -diff --git a/CXX/Python2/IndirectPythonInterface.hxx b/CXX/Python2/IndirectPythonInterface.hxx -index e2ee725..1c7cc24 100644 --- a/CXX/Python2/IndirectPythonInterface.hxx +++ b/CXX/Python2/IndirectPythonInterface.hxx -@@ -153,7 +153,7 @@ int &_Py_VerboseFlag(); - void _XINCREF( PyObject *op ); +@@ -154,7 +154,7 @@ void _XINCREF( PyObject *op ); void _XDECREF( PyObject *op ); + # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -char *__Py_PackageContext(); +const char *__Py_PackageContext(); + #endif } - #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ -diff --git a/CXX/Python3/IndirectPythonInterface.hxx b/CXX/Python3/IndirectPythonInterface.hxx -index 6163536..9807b2e 100644 ---- a/CXX/Python3/IndirectPythonInterface.hxx -+++ b/CXX/Python3/IndirectPythonInterface.hxx -@@ -149,7 +149,7 @@ int &_Py_UnicodeFlag(); - void _XINCREF( PyObject *op ); - void _XDECREF( PyObject *op ); - --char *__Py_PackageContext(); -+const char *__Py_PackageContext(); - }; - - #endif // __CXX_INDIRECT_PYTHON_INTERFACE__HXX__ -diff --git a/Src/IndirectPythonInterface.cxx b/Src/IndirectPythonInterface.cxx -index de0ca7f..b7d7d9e 100644 --- a/Src/IndirectPythonInterface.cxx +++ b/Src/IndirectPythonInterface.cxx -@@ -348,7 +348,7 @@ PyTypeObject *_CObject_Type() { return ptr__CObject_Type; } - PyTypeObject *_Bytes_Type() { return ptr__Bytes_Type; } - #endif +@@ -379,7 +379,7 @@ int &_Py_NoSiteFlag() + int &_Py_VerboseFlag() { return *ptr_Py_VerboseFlag; } + # endif -char *__Py_PackageContext() { return *ptr__Py_PackageContext; } +const char *__Py_PackageContext() { return *ptr__Py_PackageContext; } - - // -@@ -468,7 +468,7 @@ int &_Py_InteractiveFlag() { return Py_InteractiveFlag; } - int &_Py_OptimizeFlag() { return Py_OptimizeFlag; } - int &_Py_NoSiteFlag() { return Py_NoSiteFlag; } - int &_Py_VerboseFlag() { return Py_VerboseFlag; } --char *__Py_PackageContext() { return _Py_PackageContext; } -+const char *__Py_PackageContext() { return _Py_PackageContext; } - - // - // Needed to keep the abstactions for delayload interface + # if 0 + # define Py_INCREF(op) ( \