Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

[3.14] gh-136759: rename lock.h to pylock.h (GH-137041)#137072

Closed
miss-islington wants to merge 2 commits intopython:3.14python/cpython:3.14from
miss-islington:backport-ec02db5-3.14miss-islington/cpython:backport-ec02db5-3.14Copy head branch name to clipboard
Closed

[3.14] gh-136759: rename lock.h to pylock.h (GH-137041)#137072
miss-islington wants to merge 2 commits intopython:3.14python/cpython:3.14from
miss-islington:backport-ec02db5-3.14miss-islington/cpython:backport-ec02db5-3.14Copy head branch name to clipboard

Conversation

@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jul 24, 2025

Rename lock.h to pylock.h to avoid conflicts with headers of other projects.
(cherry picked from commit ec02db5)

Co-authored-by: AN Long aisk@users.noreply.github.com

Rename `lock.h` to `pylock.h` to avoid conflicts with headers of other projects.
(cherry picked from commit ec02db5)

Co-authored-by: AN Long <aisk@users.noreply.github.com>
@aisk
Copy link
Contributor

aisk commented Jul 24, 2025

All PRs on 3.14 branch are failing, so I don't think this is related and we can wait for the fix.

Copy link
Member

@ZeroIntensity ZeroIntensity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI seems to be all good.

@aisk
Copy link
Contributor

aisk commented Aug 12, 2025

According to #137075, I think we should close this.

@aisk aisk closed this Aug 12, 2025
@miss-islington miss-islington deleted the backport-ec02db5-3.14 branch January 2, 2026 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.