Skip to content

Guard mallopt calls when targeting API < 26 #2343

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

Merged
dmah42 merged 3 commits into from
Oct 21, 2026
+3 −0
Merged

Guard mallopt calls when targeting API < 26 #2343

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b153720
Guard mallopt calls when targeting API < 26
oontvoo Oct 20, 2026
72ab119
Merge branch 'main' into fix_mallopt
dmah42 Oct 20, 2026
a154bc2
remove nullptr check - gate on api 26 instead
oontvoo Oct 21, 2026
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
3 changes: 3 additions & 0 deletions src/benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@

#ifdef __ANDROID_NDK__
#include <malloc.h>
#if __ANDROID_API__ < 26
extern "C" __attribute__((weak)) int mallopt(int, int);

@LebedevRI LebedevRI Oct 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Is this kind of symbol re-declaration even allowed in C++?

@oontvoo oontvoo Oct 20, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

this is not a definition - it's just a weak declaration

@LebedevRI LebedevRI Oct 20, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

That is what i'm asking, yes.

@dmah42 dmah42 Oct 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

it is. the attribute is an extension so not covered by the standard but this sort of redclaration is fine. it must match the original declaration exactly (does mallopt have noexcept for eg?).

#endif
#endif

#ifdef BENCHMARK_OS_LINUX
Expand Down
Loading