closes bpo-34646: Remove PyAPI_* macros from declarations. (GH-9218)

diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 40cd6327312d675f534245d0c732ca0f3a5c644f..7121224e2ff1cdde8316401215d94d7d07814cb3 100644 (file)
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -245,7 +245,7 @@ EVP_hexdigest(EVPobject *self, PyObject *unused)
 
     EVP_MD_CTX_free(temp_ctx);
 
-    return _Py_strhex((const char *)digest, digest_size);
+    return _Py_strhex((const char *)digest, (Py_ssize_t)digest_size);
 }
 
 PyDoc_STRVAR(EVP_update__doc__,

diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
index f08406643f0323a53ae2e7dafb88f53956296081..13342ec239d6d6687f8b490b67b6015887433c9a 100644 (file)
--- a/Modules/_io/winconsoleio.c
+++ b/Modules/_io/winconsoleio.c
@@ -1170,6 +1170,6 @@ PyTypeObject PyWindowsConsoleIO_Type = {
     0,                                          /* tp_finalize */
 };
 
-PyAPI_DATA(PyObject *) _PyWindowsConsoleIO_Type = (PyObject*)&PyWindowsConsoleIO_Type;
+PyObject * _PyWindowsConsoleIO_Type = (PyObject*)&PyWindowsConsoleIO_Type;
 
 #endif /* MS_WINDOWS */

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index c5d9a17b002e20b50b13d6dafda656ac10bd3523..48bd5dc3941557846018e635a01f53bc44bc8573 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -488,8 +488,8 @@ PyOS_AfterFork(void)
 
 #ifdef MS_WINDOWS
 /* defined in fileutils.c */
-PyAPI_FUNC(void) _Py_time_t_to_FILE_TIME(time_t, int, FILETIME *);
-PyAPI_FUNC(void) _Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *,
+void _Py_time_t_to_FILE_TIME(time_t, int, FILETIME *);
+void _Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *,
                                             ULONG, struct _Py_stat_struct *);
 #endif
 

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index a7042ca39e388b046640ffb7831101651591d8a1..5ad283104ff330d73610e7ed257928d3194e74fe 100644 (file)
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -18,7 +18,7 @@ static int numfree = 0;
 /* undefine macro trampoline to PyCFunction_NewEx */
 #undef PyCFunction_New
 
-PyAPI_FUNC(PyObject *)
+PyObject *
 PyCFunction_New(PyMethodDef *ml, PyObject *self)
 {
     return PyCFunction_NewEx(ml, self, NULL);

diff --git a/Objects/object.c b/Objects/object.c
index 6498756c92bd0dbcc973892564b3a6ec046d5803..607f047d147ddadf3b1dc4aa3d223da68b4248a4 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -2180,7 +2180,7 @@ _PyTrash_thread_destroy_chain(void)
 /* For Py_LIMITED_API, we need an out-of-line version of _Py_Dealloc.
    Define this here, so we can undefine the macro. */
 #undef _Py_Dealloc
-PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
+void _Py_Dealloc(PyObject *);
 void
 _Py_Dealloc(PyObject *op)
 {

diff --git a/Parser/printgrammar.c b/Parser/printgrammar.c
index 7311e55170dee84bcd97729072cbe76027a824ee..1a8b0e176f2a4de52fb708647fd8d67122506aa8 100644 (file)
--- a/Parser/printgrammar.c
+++ b/Parser/printgrammar.c
@@ -18,7 +18,7 @@ printgrammar(grammar *g, FILE *fp)
     fprintf(fp, "/* Generated by Parser/pgen */\n\n");
     fprintf(fp, "#include \"pgenheaders.h\"\n");
     fprintf(fp, "#include \"grammar.h\"\n");
-    fprintf(fp, "PyAPI_DATA(grammar) _PyParser_Grammar;\n");
+    fprintf(fp, "grammar _PyParser_Grammar;\n");
     printdfas(g, fp);
     printlabels(g, fp);
     fprintf(fp, "grammar _PyParser_Grammar = {\n");

diff --git a/Python/_warnings.c b/Python/_warnings.c
index 2229206b25c99f0c2f79ffc45ae7c88bc033876d..8e1c01d0b295470fcb42d75d32b65fcfe4cb0981 100644 (file)
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -1004,7 +1004,7 @@ PyErr_WarnEx(PyObject *category, const char *text, Py_ssize_t stack_level)
 
 #undef PyErr_Warn
 
-PyAPI_FUNC(int)
+int
 PyErr_Warn(PyObject *category, const char *text)
 {
     return PyErr_WarnEx(category, text, 1);

diff --git a/Python/compile.c b/Python/compile.c
index 3528670ef67503c65f6ec05707394f6f1968d610..c6a667c29efe4a8349beb23707de43472ffa08a6 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -5550,7 +5550,7 @@ assemble(struct compiler *c, int addNone)
 }
 
 #undef PyAST_Compile
-PyAPI_FUNC(PyCodeObject *)
+PyCodeObject *
 PyAST_Compile(mod_ty mod, const char *filename, PyCompilerFlags *flags,
               PyArena *arena)
 {

diff --git a/Python/graminit.c b/Python/graminit.c
index 8e89ccea3bab6ad14814a521856330f80006e202..5770e8f6a9418b749fa31257ae7dd4b0e1ee87d5 100644 (file)
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -2,7 +2,7 @@
 
 #include "pgenheaders.h"
 #include "grammar.h"
-PyAPI_DATA(grammar) _PyParser_Grammar;
+grammar _PyParser_Grammar;
 static arc arcs_0_0[3] = {
     {2, 1},
     {3, 1},

diff --git a/Python/import.c b/Python/import.c
index 319b661f1f9b195777f2fb07738f8abed8c5ac45..2a9a5766583fed6c96b7579ba7ca8ed092ba79cb 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -1138,7 +1138,7 @@ get_path_importer(PyObject *path_importer_cache, PyObject *path_hooks,
     return importer;
 }
 
-PyAPI_FUNC(PyObject *)
+PyObject *
 PyImport_GetImporter(PyObject *path) {
     PyObject *importer=NULL, *path_importer_cache=NULL, *path_hooks=NULL;
 

diff --git a/Python/pystrhex.c b/Python/pystrhex.c
index 6dbf32dcc4f92dd52d60884adf5036466078f2f1..028f187c707cdd58da21daa649751cd2ef0776bb 100644 (file)
--- a/Python/pystrhex.c
+++ b/Python/pystrhex.c
@@ -2,6 +2,8 @@
 
 #include "Python.h"
 
+#include "pystrhex.h"
+
 static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen,
                                  int return_bytes)
 {
@@ -48,14 +50,14 @@ static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen,
     return retval;
 }
 
-PyAPI_FUNC(PyObject *) _Py_strhex(const char* argbuf, const Py_ssize_t arglen)
+PyObject * _Py_strhex(const char* argbuf, const Py_ssize_t arglen)
 {
     return _Py_strhex_impl(argbuf, arglen, 0);
 }
 
 /* Same as above but returns a bytes() instead of str() to avoid the
  * need to decode the str() when bytes are needed. */
-PyAPI_FUNC(PyObject *) _Py_strhex_bytes(const char* argbuf, const Py_ssize_t arglen)
+PyObject * _Py_strhex_bytes(const char* argbuf, const Py_ssize_t arglen)
 {
     return _Py_strhex_impl(argbuf, arglen, 1);
 }

diff --git a/Python/pystrtod.c b/Python/pystrtod.c
index 461e8dcb5e0c4a879202234e748eecef9c2c2337..98aa9ba48bdac1ec3356376b4f0791fbefb46186 100644 (file)
--- a/Python/pystrtod.c
+++ b/Python/pystrtod.c
@@ -791,7 +791,7 @@ _PyOS_ascii_formatd(char       *buffer,
 
 /* The fallback code to use if _Py_dg_dtoa is not available. */
 
-PyAPI_FUNC(char *) PyOS_double_to_string(double val,
+char * PyOS_double_to_string(double val,
                                          char format_code,
                                          int precision,
                                          int flags,
@@ -1238,7 +1238,7 @@ format_float_short(double d, char format_code,
 }
 
 
-PyAPI_FUNC(char *) PyOS_double_to_string(double val,
+char * PyOS_double_to_string(double val,
                                          char format_code,
                                          int precision,
                                          int flags,

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 273eae25e2e170a8ca7e4a9c20c84f32c65c9161..43a98c96cd5c1f20d3ef5dc0a63b04f690da0bb9 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1492,56 +1492,56 @@ PyOS_CheckStack(void)
 /* Deprecated C API functions still provided for binary compatibility */
 
 #undef PyParser_SimpleParseFile
-PyAPI_FUNC(node *)
+node *
 PyParser_SimpleParseFile(FILE *fp, const char *filename, int start)
 {
     return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
 }
 
 #undef PyParser_SimpleParseString
-PyAPI_FUNC(node *)
+node *
 PyParser_SimpleParseString(const char *str, int start)
 {
     return PyParser_SimpleParseStringFlags(str, start, 0);
 }
 
 #undef PyRun_AnyFile
-PyAPI_FUNC(int)
+int
 PyRun_AnyFile(FILE *fp, const char *name)
 {
     return PyRun_AnyFileExFlags(fp, name, 0, NULL);
 }
 
 #undef PyRun_AnyFileEx
-PyAPI_FUNC(int)
+int
 PyRun_AnyFileEx(FILE *fp, const char *name, int closeit)
 {
     return PyRun_AnyFileExFlags(fp, name, closeit, NULL);
 }
 
 #undef PyRun_AnyFileFlags
-PyAPI_FUNC(int)
+int
 PyRun_AnyFileFlags(FILE *fp, const char *name, PyCompilerFlags *flags)
 {
     return PyRun_AnyFileExFlags(fp, name, 0, flags);
 }
 
 #undef PyRun_File
-PyAPI_FUNC(PyObject *)
+PyObject *
 PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l)
 {
     return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL);
 }
 
 #undef PyRun_FileEx
-PyAPI_FUNC(PyObject *)
+PyObject *
 PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c)
 {
     return PyRun_FileExFlags(fp, p, s, g, l, c, NULL);
 }
 
 #undef PyRun_FileFlags
-PyAPI_FUNC(PyObject *)
+PyObject *
 PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l,
                 PyCompilerFlags *flags)
 {
@@ -1549,14 +1549,14 @@ PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l,
 }
 
 #undef PyRun_SimpleFile
-PyAPI_FUNC(int)
+int
 PyRun_SimpleFile(FILE *f, const char *p)
 {
     return PyRun_SimpleFileExFlags(f, p, 0, NULL);
 }
 
 #undef PyRun_SimpleFileEx
-PyAPI_FUNC(int)
+int
 PyRun_SimpleFileEx(FILE *f, const char *p, int c)
 {
     return PyRun_SimpleFileExFlags(f, p, c, NULL);
@@ -1564,28 +1564,28 @@ PyRun_SimpleFileEx(FILE *f, const char *p, int c)
 
 
 #undef PyRun_String
-PyAPI_FUNC(PyObject *)
+PyObject *
 PyRun_String(const char *str, int s, PyObject *g, PyObject *l)
 {
     return PyRun_StringFlags(str, s, g, l, NULL);
 }
 
 #undef PyRun_SimpleString
-PyAPI_FUNC(int)
+int
 PyRun_SimpleString(const char *s)
 {
     return PyRun_SimpleStringFlags(s, NULL);
 }
 
 #undef Py_CompileString
-PyAPI_FUNC(PyObject *)
+PyObject *
 Py_CompileString(const char *str, const char *p, int s)
 {
     return Py_CompileStringExFlags(str, p, s, NULL, -1);
 }
 
 #undef Py_CompileStringFlags
-PyAPI_FUNC(PyObject *)
+PyObject *
 Py_CompileStringFlags(const char *str, const char *p, int s,
                       PyCompilerFlags *flags)
 {
@@ -1593,14 +1593,14 @@ Py_CompileStringFlags(const char *str, const char *p, int s,
 }
 
 #undef PyRun_InteractiveOne
-PyAPI_FUNC(int)
+int
 PyRun_InteractiveOne(FILE *f, const char *p)
 {
     return PyRun_InteractiveOneFlags(f, p, NULL);
 }
 
 #undef PyRun_InteractiveLoop
-PyAPI_FUNC(int)
+int
 PyRun_InteractiveLoop(FILE *f, const char *p)
 {
     return PyRun_InteractiveLoopFlags(f, p, NULL);