bpo-35081: Move accu.h to Include/internal/pycore_accu.h (GH-10271)
The accu.h header is no longer part of the Python C API: it has been moved to the "internal" headers which are restricted to Python itself. Replace #include "accu.h" with #include "pycore_accu.h".
This commit is contained in:
parent
50b48572d9
commit
e281f7d80c
|
@ -1,6 +1,9 @@
|
|||
#ifndef Py_LIMITED_API
|
||||
#ifndef Py_ACCU_H
|
||||
#define Py_ACCU_H
|
||||
#ifndef Py_INTERNAL_ACCU_H
|
||||
#define Py_INTERNAL_ACCU_H
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*** This is a private API for use by the interpreter and the stdlib.
|
||||
*** Its definition may be changed or removed at any moment.
|
||||
|
@ -12,10 +15,6 @@
|
|||
* behaviour of using a naive repeated concatenation scheme.
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#undef small /* defined by some Windows headers */
|
||||
|
||||
typedef struct {
|
||||
|
@ -32,6 +31,5 @@ PyAPI_FUNC(void) _PyAccu_Destroy(_PyAccu *acc);
|
|||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* Py_ACCU_H */
|
||||
#endif /* Py_LIMITED_API */
|
||||
#endif /* !Py_INTERNAL_ACCU_H */
|
||||
#endif /* !Py_LIMITED_API */
|
|
@ -935,7 +935,6 @@ regen-typeslots:
|
|||
PYTHON_HEADERS= \
|
||||
$(srcdir)/Include/Python.h \
|
||||
$(srcdir)/Include/abstract.h \
|
||||
$(srcdir)/Include/accu.h \
|
||||
$(srcdir)/Include/asdl.h \
|
||||
$(srcdir)/Include/ast.h \
|
||||
$(srcdir)/Include/bltinmodule.h \
|
||||
|
@ -1025,6 +1024,7 @@ PYTHON_HEADERS= \
|
|||
pyconfig.h \
|
||||
$(PARSER_HEADERS) \
|
||||
$(srcdir)/Include/Python-ast.h \
|
||||
$(srcdir)/Include/internal/pycore_accu.h \
|
||||
$(srcdir)/Include/internal/pycore_atomic.h \
|
||||
$(srcdir)/Include/internal/pycore_ceval.h \
|
||||
$(srcdir)/Include/internal/pycore_context.h \
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#define PY_SSIZE_T_CLEAN
|
||||
#include "Python.h"
|
||||
#include "structmember.h"
|
||||
#include "accu.h"
|
||||
#include "pycore_accu.h"
|
||||
#include "_iomodule.h"
|
||||
|
||||
/* Implementation note: the buffer is always at least one character longer
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#include "Python.h"
|
||||
#include "structmember.h"
|
||||
#include "accu.h"
|
||||
#include "pycore_accu.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define UNUSED __attribute__((__unused__))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* Accumulator struct implementation */
|
||||
|
||||
#include "Python.h"
|
||||
#include "accu.h"
|
||||
#include "pycore_accu.h"
|
||||
|
||||
static PyObject *
|
||||
join_list_unicode(PyObject *lst)
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include "Python.h"
|
||||
#include "pycore_state.h"
|
||||
#include "accu.h"
|
||||
#include "pycore_accu.h"
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
#include <stddef.h>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include "Python.h"
|
||||
#include "pycore_state.h"
|
||||
#include "accu.h"
|
||||
#include "pycore_accu.h"
|
||||
|
||||
/*[clinic input]
|
||||
class tuple "PyTupleObject *" "&PyTuple_Type"
|
||||
|
|
|
@ -79,7 +79,6 @@
|
|||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\Include\abstract.h" />
|
||||
<ClInclude Include="..\Include\accu.h" />
|
||||
<ClInclude Include="..\Include\asdl.h" />
|
||||
<ClInclude Include="..\Include\ast.h" />
|
||||
<ClInclude Include="..\Include\bitset.h" />
|
||||
|
@ -112,6 +111,7 @@
|
|||
<ClInclude Include="..\Include\graminit.h" />
|
||||
<ClInclude Include="..\Include\grammar.h" />
|
||||
<ClInclude Include="..\Include\import.h" />
|
||||
<ClInclude Include="..\Include\internal\pycore_accu.h" />
|
||||
<ClInclude Include="..\Include\internal\pycore_atomic.h" />
|
||||
<ClInclude Include="..\Include\internal\pycore_ceval.h" />
|
||||
<ClInclude Include="..\Include\internal\pycore_condvar.h" />
|
||||
|
@ -154,7 +154,6 @@
|
|||
<ClInclude Include="..\Include\pyerrors.h" />
|
||||
<ClInclude Include="..\Include\pyexpat.h" />
|
||||
<ClInclude Include="..\Include\pyfpe.h" />
|
||||
<ClInclude Include="..\Include\internal\pygetopt.h" />
|
||||
<ClInclude Include="..\Include\pylifecycle.h" />
|
||||
<ClInclude Include="..\Include\pymath.h" />
|
||||
<ClInclude Include="..\Include\pytime.h" />
|
||||
|
|
|
@ -36,9 +36,6 @@
|
|||
<ClInclude Include="..\Include\abstract.h">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Include\accu.h">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Include\asdl.h">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
|
@ -135,6 +132,9 @@
|
|||
<ClInclude Include="..\Include\import.h">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Include\internal\pycore_accu.h">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Include\internal\pycore_atomic.h">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
|
|
Loading…
Reference in New Issue