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.

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

HookSystem: rename PAGESIZE_VAR from PAGESIZE to avoid conflict #4321

Merged
merged 1 commit into from Jan 1, 2024

Conversation

earboxer
Copy link
Contributor

@earboxer earboxer commented Jan 1, 2024

Describe your PR, what does it fix/add?

This fixes a build issue with v0.34.0 (on alpine linux, and maybe others?)

In file included from /usr/include/limits.h:40,
                 from /usr/include/fortify/wchar.h:23,
                 from /usr/include/c++/13.2.1/cwchar:44,
                 from /usr/include/c++/13.2.1/bits/postypes.h:40,
                 from /usr/include/c++/13.2.1/iosfwd:42,
                 from /usr/include/c++/13.2.1/ios:40,
                 from /usr/include/c++/13.2.1/ostream:40,
                 from /usr/include/c++/13.2.1/bits/unique_ptr.h:42,
                 from /usr/include/c++/13.2.1/memory:78,
                 from ../src/Compositor.hpp:3,
                 from ../src/pch/pch.hpp:1:
../src/plugins/HookSystem.cpp: In member function 'bool CFunctionHook::hook()':
../src/plugins/HookSystem.cpp:193:20: error: expected unqualified-id before numeric constant
  193 |     const auto     PAGESIZE  = sysconf(_SC_PAGE_SIZE);
      |                    ^~~~~~~~
ninja: subcommand failed
>>> ERROR: hyprland: build failed

Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)

Is it ready for merging, or does it need work?

Yes, it is ready for merging

vaxerski
vaxerski previously approved these changes Jan 1, 2024
Copy link
Member

@vaxerski vaxerski left a comment

Choose a reason for hiding this comment

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

lgtm

@vaxerski
Copy link
Member

vaxerski commented Jan 1, 2024

needs a clang-format

@vaxerski vaxerski merged commit 1607e96 into hyprwm:main Jan 1, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants