diff options
| -rw-r--r-- | Include/internal/pycore_accu.h (renamed from Include/accu.h) | 16 | ||||
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Modules/_io/stringio.c | 2 | ||||
| -rw-r--r-- | Modules/_json.c | 2 | ||||
| -rw-r--r-- | Objects/accu.c | 2 | ||||
| -rw-r--r-- | Objects/listobject.c | 2 | ||||
| -rw-r--r-- | Objects/tupleobject.c | 2 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 3 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 6 |
9 files changed, 17 insertions, 20 deletions
diff --git a/Include/accu.h b/Include/internal/pycore_accu.h index 3636ea6..ab1aad2 100644 --- a/Include/accu.h +++ b/Include/internal/pycore_accu.h @@ -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 */ diff --git a/Makefile.pre.in b/Makefile.pre.in index 0336290..fc8b1e4 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -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 \ diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index 5a03715..793fa1e 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -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 diff --git a/Modules/_json.c b/Modules/_json.c index ac6e017..53e1e88 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -7,7 +7,7 @@ #include "Python.h" #include "structmember.h" -#include "accu.h" +#include "pycore_accu.h" #ifdef __GNUC__ #define UNUSED __attribute__((__unused__)) diff --git a/Objects/accu.c b/Objects/accu.c index 48fe02d..c8b5d38 100644 --- a/Objects/accu.c +++ b/Objects/accu.c @@ -1,7 +1,7 @@ /* Accumulator struct implementation */ #include "Python.h" -#include "accu.h" +#include "pycore_accu.h" static PyObject * join_list_unicode(PyObject *lst) diff --git a/Objects/listobject.c b/Objects/listobject.c index e38b21f..ffd91a6 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2,7 +2,7 @@ #include "Python.h" #include "pycore_state.h" -#include "accu.h" +#include "pycore_accu.h" #ifdef STDC_HEADERS #include <stddef.h> diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index cce266f..c997bc6 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -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" diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index ebc35a7..6becb8a 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -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" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 052c89c..bc118c6 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -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> |