bpo-43795: Mark PyCodec_Unregister as a function, not data, in stable ABI (GH-25920)

(cherry picked from commit cf86996a8e5965ff587040d0c2831c3132081a21)

Co-authored-by: Petr Viktorin <encukou@gmail.com>

diff --git a/Misc/NEWS.d/next/C API/2021-05-05-19-04-50.bpo-43795.9Ojj73.rst b/Misc/NEWS.d/next/C API/2021-05-05-19-04-50.bpo-43795.9Ojj73.rst
new file mode 100644 (file)
index 0000000..20a3823
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2021-05-05-19-04-50.bpo-43795.9Ojj73.rst
@@ -0,0 +1,2 @@
+:c:func:`PyCodec_Unregister` is now properly exported as a function in the
+Windows Stable ABI DLL.

diff --git a/Misc/stable_abi.txt b/Misc/stable_abi.txt
index 2a802bd5f4b831da3009b0e4d06891b3f9b664ce..a78bcb76b41df693f1c71ad670438ee8ee64ec43 100644 (file)
--- a/Misc/stable_abi.txt
+++ b/Misc/stable_abi.txt
@@ -2097,7 +2097,7 @@ function PyModule_AddObjectRef
     added 3.10
 data Py_FileSystemDefaultEncodeErrors
     added 3.10
-data PyCodec_Unregister
+function PyCodec_Unregister
     added 3.10
 function PyErr_SetInterruptEx
     added 3.10

diff --git a/PC/python3dll.c b/PC/python3dll.c
index 574d4dcad9f75b0b7b9981b26e383e7c12fb7567..200d1d14e294d18c75ad224041edc050ff5c1ee9 100755 (executable)
--- a/PC/python3dll.c
+++ b/PC/python3dll.c
@@ -156,6 +156,7 @@ EXPORT_FUNC(PyCodec_ReplaceErrors)
 EXPORT_FUNC(PyCodec_StreamReader)
 EXPORT_FUNC(PyCodec_StreamWriter)
 EXPORT_FUNC(PyCodec_StrictErrors)
+EXPORT_FUNC(PyCodec_Unregister)
 EXPORT_FUNC(PyCodec_XMLCharRefReplaceErrors)
 EXPORT_FUNC(PyComplex_FromDoubles)
 EXPORT_FUNC(PyComplex_ImagAsDouble)
@@ -734,7 +735,6 @@ EXPORT_DATA(PyCallIter_Type)
 EXPORT_DATA(PyCapsule_Type)
 EXPORT_DATA(PyCFunction_Type)
 EXPORT_DATA(PyClassMethodDescr_Type)
-EXPORT_DATA(PyCodec_Unregister)
 EXPORT_DATA(PyComplex_Type)
 EXPORT_DATA(PyDict_Type)
 EXPORT_DATA(PyDictItems_Type)