closes bpo-37633: Reëxport some function compatibility wrappers for macros in pythonrun.h. (GH-17056)

miss-islington · benjaminp · web-flow · commit 4c22e1665c4d · 2019-11-04T21:52:59.000-08:00
(cherry picked from commit 62161ce) Co-authored-by: Benjamin Peterson <benjamin@python.org>
diff --git a/Misc/NEWS.d/next/C API/2019-11-04-21-10-47.bpo-37633.oOGVdo.rst b/Misc/NEWS.d/next/C API/2019-11-04-21-10-47.bpo-37633.oOGVdo.rst
@@ -0,0 +1 @@
+Re&euml;xport some function compatibility wrappers for macros in ``pythonrun.h``.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1648,115 +1648,115 @@ PyOS_CheckStack(void)
 /* Deprecated C API functions still provided for binary compatibility */
 
 #undef PyParser_SimpleParseFile
-node *
+PyAPI_FUNC(node *)
 PyParser_SimpleParseFile(FILE *fp, const char *filename, int start)
 {
     return PyParser_SimpleParseFileFlags(fp, filename, start, 0);
 }
 
 #undef PyParser_SimpleParseString
-node *
+PyAPI_FUNC(node *)
 PyParser_SimpleParseString(const char *str, int start)
 {
     return PyParser_SimpleParseStringFlags(str, start, 0);
 }
 
 #undef PyRun_AnyFile
-int
+PyAPI_FUNC(int)
 PyRun_AnyFile(FILE *fp, const char *name)
 {
     return PyRun_AnyFileExFlags(fp, name, 0, NULL);
 }
 
 #undef PyRun_AnyFileEx
-int
+PyAPI_FUNC(int)
 PyRun_AnyFileEx(FILE *fp, const char *name, int closeit)
 {
     return PyRun_AnyFileExFlags(fp, name, closeit, NULL);
 }
 
 #undef PyRun_AnyFileFlags
-int
+PyAPI_FUNC(int)
 PyRun_AnyFileFlags(FILE *fp, const char *name, PyCompilerFlags *flags)
 {
     return PyRun_AnyFileExFlags(fp, name, 0, flags);
 }
 
 #undef PyRun_File
-PyObject *
+PyAPI_FUNC(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
-PyObject *
+PyAPI_FUNC(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
-PyObject *
+PyAPI_FUNC(PyObject *)
 PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l,
                 PyCompilerFlags *flags)
 {
     return PyRun_FileExFlags(fp, p, s, g, l, 0, flags);
 }
 
 #undef PyRun_SimpleFile
-int
+PyAPI_FUNC(int)
 PyRun_SimpleFile(FILE *f, const char *p)
 {
     return PyRun_SimpleFileExFlags(f, p, 0, NULL);
 }
 
 #undef PyRun_SimpleFileEx
-int
+PyAPI_FUNC(int)
 PyRun_SimpleFileEx(FILE *f, const char *p, int c)
 {
     return PyRun_SimpleFileExFlags(f, p, c, NULL);
 }
 
 
 #undef PyRun_String
-PyObject *
+PyAPI_FUNC(PyObject *)
 PyRun_String(const char *str, int s, PyObject *g, PyObject *l)
 {
     return PyRun_StringFlags(str, s, g, l, NULL);
 }
 
 #undef PyRun_SimpleString
-int
+PyAPI_FUNC(int)
 PyRun_SimpleString(const char *s)
 {
     return PyRun_SimpleStringFlags(s, NULL);
 }
 
 #undef Py_CompileString
-PyObject *
+PyAPI_FUNC(PyObject *)
 Py_CompileString(const char *str, const char *p, int s)
 {
     return Py_CompileStringExFlags(str, p, s, NULL, -1);
 }
 
 #undef Py_CompileStringFlags
-PyObject *
+PyAPI_FUNC(PyObject *)
 Py_CompileStringFlags(const char *str, const char *p, int s,
                       PyCompilerFlags *flags)
 {
     return Py_CompileStringExFlags(str, p, s, flags, -1);
 }
 
 #undef PyRun_InteractiveOne
-int
+PyAPI_FUNC(int)
 PyRun_InteractiveOne(FILE *f, const char *p)
 {
     return PyRun_InteractiveOneFlags(f, p, NULL);
 }
 
 #undef PyRun_InteractiveLoop
-int
+PyAPI_FUNC(int)
 PyRun_InteractiveLoop(FILE *f, const char *p)
 {
     return PyRun_InteractiveLoopFlags(f, p, NULL);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Reëxport some function compatibility wrappers for macros in ``pythonrun.h``.
Original file line number	Diff line number	Diff line change
`@@ -1648,115 +1648,115 @@ PyOS_CheckStack(void)`
`1648`	`1648`	`/* Deprecated C API functions still provided for binary compatibility */`
`1649`	`1649`
`1650`	`1650`	`#undef PyParser_SimpleParseFile`
`1651`		`-node *`
	`1651`	`+PyAPI_FUNC(node *)`
`1652`	`1652`	`PyParser_SimpleParseFile(FILE fp, const char filename, int start)`
`1653`	`1653`	`{`
`1654`	`1654`	`return PyParser_SimpleParseFileFlags(fp, filename, start, 0);`
`1655`	`1655`	`}`
`1656`	`1656`
`1657`	`1657`	`#undef PyParser_SimpleParseString`
`1658`		`-node *`
	`1658`	`+PyAPI_FUNC(node *)`
`1659`	`1659`	`PyParser_SimpleParseString(const char *str, int start)`
`1660`	`1660`	`{`
`1661`	`1661`	`return PyParser_SimpleParseStringFlags(str, start, 0);`
`1662`	`1662`	`}`
`1663`	`1663`
`1664`	`1664`	`#undef PyRun_AnyFile`
`1665`		`-int`
	`1665`	`+PyAPI_FUNC(int)`
`1666`	`1666`	`PyRun_AnyFile(FILE fp, const char name)`
`1667`	`1667`	`{`
`1668`	`1668`	`return PyRun_AnyFileExFlags(fp, name, 0, NULL);`
`1669`	`1669`	`}`
`1670`	`1670`
`1671`	`1671`	`#undef PyRun_AnyFileEx`
`1672`		`-int`
	`1672`	`+PyAPI_FUNC(int)`
`1673`	`1673`	`PyRun_AnyFileEx(FILE fp, const char name, int closeit)`
`1674`	`1674`	`{`
`1675`	`1675`	`return PyRun_AnyFileExFlags(fp, name, closeit, NULL);`
`1676`	`1676`	`}`
`1677`	`1677`
`1678`	`1678`	`#undef PyRun_AnyFileFlags`
`1679`		`-int`
	`1679`	`+PyAPI_FUNC(int)`
`1680`	`1680`	`PyRun_AnyFileFlags(FILE fp, const char name, PyCompilerFlags *flags)`
`1681`	`1681`	`{`
`1682`	`1682`	`return PyRun_AnyFileExFlags(fp, name, 0, flags);`
`1683`	`1683`	`}`
`1684`	`1684`
`1685`	`1685`	`#undef PyRun_File`
`1686`		`-PyObject *`
	`1686`	`+PyAPI_FUNC(PyObject *)`
`1687`	`1687`	`PyRun_File(FILE fp, const char p, int s, PyObject g, PyObject l)`
`1688`	`1688`	`{`
`1689`	`1689`	`return PyRun_FileExFlags(fp, p, s, g, l, 0, NULL);`
`1690`	`1690`	`}`
`1691`	`1691`
`1692`	`1692`	`#undef PyRun_FileEx`
`1693`		`-PyObject *`
	`1693`	`+PyAPI_FUNC(PyObject *)`
`1694`	`1694`	`PyRun_FileEx(FILE fp, const char p, int s, PyObject g, PyObject l, int c)`
`1695`	`1695`	`{`
`1696`	`1696`	`return PyRun_FileExFlags(fp, p, s, g, l, c, NULL);`
`1697`	`1697`	`}`
`1698`	`1698`
`1699`	`1699`	`#undef PyRun_FileFlags`
`1700`		`-PyObject *`
	`1700`	`+PyAPI_FUNC(PyObject *)`
`1701`	`1701`	`PyRun_FileFlags(FILE fp, const char p, int s, PyObject g, PyObject l,`
`1702`	`1702`	`PyCompilerFlags *flags)`
`1703`	`1703`	`{`
`1704`	`1704`	`return PyRun_FileExFlags(fp, p, s, g, l, 0, flags);`
`1705`	`1705`	`}`
`1706`	`1706`
`1707`	`1707`	`#undef PyRun_SimpleFile`
`1708`		`-int`
	`1708`	`+PyAPI_FUNC(int)`
`1709`	`1709`	`PyRun_SimpleFile(FILE f, const char p)`
`1710`	`1710`	`{`
`1711`	`1711`	`return PyRun_SimpleFileExFlags(f, p, 0, NULL);`
`1712`	`1712`	`}`
`1713`	`1713`
`1714`	`1714`	`#undef PyRun_SimpleFileEx`
`1715`		`-int`
	`1715`	`+PyAPI_FUNC(int)`
`1716`	`1716`	`PyRun_SimpleFileEx(FILE f, const char p, int c)`
`1717`	`1717`	`{`
`1718`	`1718`	`return PyRun_SimpleFileExFlags(f, p, c, NULL);`
`1719`	`1719`	`}`
`1720`	`1720`
`1721`	`1721`
`1722`	`1722`	`#undef PyRun_String`
`1723`		`-PyObject *`
	`1723`	`+PyAPI_FUNC(PyObject *)`
`1724`	`1724`	`PyRun_String(const char str, int s, PyObject g, PyObject *l)`
`1725`	`1725`	`{`
`1726`	`1726`	`return PyRun_StringFlags(str, s, g, l, NULL);`
`1727`	`1727`	`}`
`1728`	`1728`
`1729`	`1729`	`#undef PyRun_SimpleString`
`1730`		`-int`
	`1730`	`+PyAPI_FUNC(int)`
`1731`	`1731`	`PyRun_SimpleString(const char *s)`
`1732`	`1732`	`{`
`1733`	`1733`	`return PyRun_SimpleStringFlags(s, NULL);`
`1734`	`1734`	`}`
`1735`	`1735`
`1736`	`1736`	`#undef Py_CompileString`
`1737`		`-PyObject *`
	`1737`	`+PyAPI_FUNC(PyObject *)`
`1738`	`1738`	`Py_CompileString(const char str, const char p, int s)`
`1739`	`1739`	`{`
`1740`	`1740`	`return Py_CompileStringExFlags(str, p, s, NULL, -1);`
`1741`	`1741`	`}`
`1742`	`1742`
`1743`	`1743`	`#undef Py_CompileStringFlags`
`1744`		`-PyObject *`
	`1744`	`+PyAPI_FUNC(PyObject *)`
`1745`	`1745`	`Py_CompileStringFlags(const char str, const char p, int s,`
`1746`	`1746`	`PyCompilerFlags *flags)`
`1747`	`1747`	`{`
`1748`	`1748`	`return Py_CompileStringExFlags(str, p, s, flags, -1);`
`1749`	`1749`	`}`
`1750`	`1750`
`1751`	`1751`	`#undef PyRun_InteractiveOne`
`1752`		`-int`
	`1752`	`+PyAPI_FUNC(int)`
`1753`	`1753`	`PyRun_InteractiveOne(FILE f, const char p)`
`1754`	`1754`	`{`
`1755`	`1755`	`return PyRun_InteractiveOneFlags(f, p, NULL);`
`1756`	`1756`	`}`
`1757`	`1757`
`1758`	`1758`	`#undef PyRun_InteractiveLoop`
`1759`		`-int`
	`1759`	`+PyAPI_FUNC(int)`
`1760`	`1760`	`PyRun_InteractiveLoop(FILE f, const char p)`
`1761`	`1761`	`{`
`1762`	`1762`	`return PyRun_InteractiveLoopFlags(f, p, NULL);`