diff options
author | Victor Stinner <vstinner@python.org> | 2022-02-22 23:11:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-22 23:11:48 +0100 |
commit | 66b3cd7063322a9f5c922a97bbd06fdb98309999 (patch) | |
tree | 47e0543c2349afa7e57b6d167a7763828a714577 /PCbuild | |
parent | bpo-46659: Deprecate locale.getdefaultlocale() (GH-31206) (diff) | |
download | cpython-66b3cd7063322a9f5c922a97bbd06fdb98309999.tar.gz cpython-66b3cd7063322a9f5c922a97bbd06fdb98309999.tar.bz2 cpython-66b3cd7063322a9f5c922a97bbd06fdb98309999.zip |
bpo-45459: Rename buffer.h to pybuffer.h (#31201)
Rename Include/buffer.h header file to Include/pybuffer.h to avoid
conflicts with projects having an existing "buffer.h" header file.
* Incude pybuffer.h before object.h in Python.h.
* Remove #include "buffer.h" from Include/cpython/object.h.
* Add a forward declaration of the PyObject type in pybuffer.h to fix
an inter-dependency issue.
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/pythoncore.vcxproj | 1 | ||||
-rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 8f9c4fe63b8..c2f1a016bc1 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -263,6 +263,7 @@ <ClInclude Include="..\Include\osmodule.h" /> <ClInclude Include="..\Include\patchlevel.h" /> <ClInclude Include="..\Include\py_curses.h" /> + <ClInclude Include="..\Include\pybuffer.h" /> <ClInclude Include="..\Include\pycapsule.h" /> <ClInclude Include="..\Include\pyerrors.h" /> <ClInclude Include="..\Include\pyexpat.h" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index dc3b5547794..b300103bbb4 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -147,6 +147,9 @@ <ClInclude Include="..\Include\py_curses.h"> <Filter>Include</Filter> </ClInclude> + <ClInclude Include="..\Include\pybuffer.h"> + <Filter>Include</Filter> + </ClInclude> <ClInclude Include="..\Include\pycapsule.h"> <Filter>Include</Filter> </ClInclude> |