Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-91731: Add macro compatibility for static_assert for old libcs #92559

Merged
merged 6 commits into from
May 9, 2022
Merged

gh-91731: Add macro compatibility for static_assert for old libcs #92559

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53ecbb6
gh-91731: Add macro compatibility for static_assert for old libcs
pablogsal May 9, 2022
4ec5d94
Update Include/pymacro.h
pablogsal May 9, 2022
6cdd724
Update Include/pymacro.h
pablogsal May 9, 2022
d487210
Update Include/pymacro.h
vstinner May 9, 2022
c55a3d4
Update Include/pymacro.h
vstinner May 9, 2022
e951053
Update Include/pymacro.h
vstinner May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Include/pymacro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
# define static_assert _Static_assert
#endif

// static_assert is defined in GLIB from version 2.16. Before it requires
Copy link
Member

Choose a reason for hiding this comment

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

GLIBC? (GLIB exists, but it's something quite different.)

Copy link
Member Author

@pablogsal pablogsal May 10, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

That's a typo, indeed. It should be GLIBC

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed in #92618

// compiler support (gcc >= 4.6) and is called _Static_assert.
#if (defined(__GLIBC__) \
&& (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 16)) \
&& !defined(static_assert))
# define static_assert _Static_assert
#endif

/* Minimum value between x and y */
#define Py_MIN(x, y) (((x) > (y)) ? (y) : (x))

Expand Down