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

BACKENDS: CURL: Fix libcurl redefining ARRAYSIZE on Win32 #4794

Merged
merged 1 commit into from
Mar 9, 2023
Merged

BACKENDS: CURL: Fix libcurl redefining ARRAYSIZE on Win32 #4794

merged 1 commit into from
Mar 9, 2023

Conversation

dwatteau
Copy link
Contributor

@dwatteau dwatteau commented Mar 9, 2023

This is just meant to fix the following ARRAYSIZE macro redefinition warnings on Win32:

C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\um\winnt.h(1375,1): warning C4005: 'ARRAYSIZE': macro redefinition (compiling source file ..\backends\networking\curl\socket.cpp) [D:\a\scummvm\scummvm\build-scummvm\scummvm.vcxproj]
D:\a\scummvm\scummvm\common\util.h(91,1): message : see previous definition of 'ARRAYSIZE' (compiling source file ..\backends\networking\curl\socket.cpp) [D:\a\scummvm\scummvm\build-scummvm\scummvm.vcxproj]

C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\um\winnt.h(1375,1): warning C4005: 'ARRAYSIZE': macro redefinition (compiling source file ..\backends\networking\curl\url.cpp) [D:\a\scummvm\scummvm\build-scummvm\scummvm.vcxproj]
D:\a\scummvm\scummvm\common\util.h(91,1): message : see previous definition of 'ARRAYSIZE' (compiling source file ..\backends\networking\curl\url.cpp) [D:\a\scummvm\scummvm\build-scummvm\scummvm.vcxproj]

as was done in commit 272d410 for example.

As a PR for that quick CI test.

@dwatteau
Copy link
Contributor Author

dwatteau commented Mar 9, 2023

Self-merging since the PR was mostly for the CI run, and this kind of change was already done in the past.

@dwatteau dwatteau merged commit ae2b318 into scummvm:master Mar 9, 2023
@dwatteau dwatteau deleted the fix/curl-header-arraysize-redefinition-windows branch March 9, 2023 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@dwatteau