Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-25 18:54:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-136759: rename lock.h to pylock.h (#137041)

Browse source 
Rename `lock.h` to `pylock.h` to avoid conflicts with headers of other projects.
This commit is contained in:
AN Long 2025-07-24 19:46:07 +09:00 • committed by GitHub
parent ae4d27eba7
commit ec02db5caa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/Python.h
View file

@ -68,7 +68,7 @@
#include "pybuffer.h" #include "pybuffer.h"
#include "pystats.h" #include "pystats.h"
#include "pyatomic.h" #include "pyatomic.h"
#include "lock.h" #include "pylock.h"
#include "critical_section.h" #include "critical_section.h"
#include "object.h" #include "object.h"
#include "refcount.h" #include "refcount.h"

0
Include/cpython/lock.h → Include/cpython/pylock.h
View file

2
Include/internal/pycore_lock.h
View file

@ -13,7 +13,7 @@ extern "C" {
# error "this header requires Py_BUILD_CORE define" # error "this header requires Py_BUILD_CORE define"
#endif #endif
//_Py_UNLOCKED is defined as 0 and _Py_LOCKED as 1 in Include/cpython/lock.h //_Py_UNLOCKED is defined as 0 and _Py_LOCKED as 1 in Include/cpython/pylock.h
#define _Py_HAS_PARKED 2 #define _Py_HAS_PARKED 2
#define _Py_ONCE_INITIALIZED 4 #define _Py_ONCE_INITIALIZED 4

2
Include/lock.h → Include/pylock.h
View file

@ -6,7 +6,7 @@ extern "C" {
#ifndef Py_LIMITED_API #ifndef Py_LIMITED_API
# define Py_CPYTHON_LOCK_H # define Py_CPYTHON_LOCK_H
# include "cpython/lock.h" # include "cpython/pylock.h"
# undef Py_CPYTHON_LOCK_H # undef Py_CPYTHON_LOCK_H
#endif #endif

4
Makefile.pre.in
View file

@ -1187,7 +1187,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/intrcheck.h \ $(srcdir)/Include/intrcheck.h \
$(srcdir)/Include/iterobject.h \ $(srcdir)/Include/iterobject.h \
$(srcdir)/Include/listobject.h \ $(srcdir)/Include/listobject.h \
$(srcdir)/Include/lock.h \ $(srcdir)/Include/pylock.h \
$(srcdir)/Include/longobject.h \ $(srcdir)/Include/longobject.h \
$(srcdir)/Include/marshal.h \ $(srcdir)/Include/marshal.h \
$(srcdir)/Include/memoryobject.h \ $(srcdir)/Include/memoryobject.h \
@ -1264,7 +1264,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/cpython/import.h \ $(srcdir)/Include/cpython/import.h \
$(srcdir)/Include/cpython/initconfig.h \ $(srcdir)/Include/cpython/initconfig.h \
$(srcdir)/Include/cpython/listobject.h \ $(srcdir)/Include/cpython/listobject.h \
$(srcdir)/Include/cpython/lock.h \ $(srcdir)/Include/cpython/pylock.h \
$(srcdir)/Include/cpython/longintrepr.h \ $(srcdir)/Include/cpython/longintrepr.h \
$(srcdir)/Include/cpython/longobject.h \ $(srcdir)/Include/cpython/longobject.h \
$(srcdir)/Include/cpython/memoryobject.h \ $(srcdir)/Include/cpython/memoryobject.h \

1
Misc/NEWS.d/next/C_API/2025-07-23-22-30-23.gh-issue-136759.ffB4wO.rst Normal file
View file

@ -0,0 +1 @@
Rename ``lock.h`` to ``pylock.h`` to avoid potential include conflicts.

4
PCbuild/pythoncore.vcxproj
View file

@ -165,7 +165,7 @@
<ClInclude Include="..\Include\cpython\import.h" /> <ClInclude Include="..\Include\cpython\import.h" />
<ClInclude Include="..\Include\cpython\initconfig.h" /> <ClInclude Include="..\Include\cpython\initconfig.h" />
<ClInclude Include="..\Include\cpython\listobject.h" /> <ClInclude Include="..\Include\cpython\listobject.h" />
<ClInclude Include="..\Include\cpython\lock.h" /> <ClInclude Include="..\Include\cpython\pylock.h" />
<ClInclude Include="..\Include\cpython\longintrepr.h" /> <ClInclude Include="..\Include\cpython\longintrepr.h" />
<ClInclude Include="..\Include\cpython\longobject.h" /> <ClInclude Include="..\Include\cpython\longobject.h" />
<ClInclude Include="..\Include\cpython\memoryobject.h" /> <ClInclude Include="..\Include\cpython\memoryobject.h" />
@ -332,7 +332,7 @@
<ClInclude Include="..\Include\intrcheck.h" /> <ClInclude Include="..\Include\intrcheck.h" />
<ClInclude Include="..\Include\iterobject.h" /> <ClInclude Include="..\Include\iterobject.h" />
<ClInclude Include="..\Include\listobject.h" /> <ClInclude Include="..\Include\listobject.h" />
<ClInclude Include="..\Include\lock.h" /> <ClInclude Include="..\Include\pylock.h" />
<ClInclude Include="..\Include\longobject.h" /> <ClInclude Include="..\Include\longobject.h" />
<ClInclude Include="..\Include\marshal.h" /> <ClInclude Include="..\Include\marshal.h" />
<ClInclude Include="..\Include\memoryobject.h" /> <ClInclude Include="..\Include\memoryobject.h" />

4
PCbuild/pythoncore.vcxproj.filters
View file

@ -120,7 +120,7 @@
<ClInclude Include="..\Include\listobject.h"> <ClInclude Include="..\Include\listobject.h">
<Filter>Include</Filter> <Filter>Include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Include\lock.h"> <ClInclude Include="..\Include\pylock.h">
<Filter>Include</Filter> <Filter>Include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Include\longobject.h"> <ClInclude Include="..\Include\longobject.h">
@ -414,7 +414,7 @@
<ClInclude Include="..\Include\cpython\listobject.h"> <ClInclude Include="..\Include\cpython\listobject.h">
<Filter>Include\cpython</Filter> <Filter>Include\cpython</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Include\cpython\lock.h"> <ClInclude Include="..\Include\cpython\pylock.h">
<Filter>Include</Filter> <Filter>Include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Include\cpython\longintrepr.h"> <ClInclude Include="..\Include\cpython\longintrepr.h">