Skip to content

windows: fix header conflict for msys2-w32api-headers 11.0.1+ #1332

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
Merged
merged 1 commit into from
May 30, 2023
Merged

windows: fix header conflict for msys2-w32api-headers 11.0.1+ #1332

merged 1 commit into from
May 30, 2023

Conversation

psyke83
Copy link
Contributor

@psyke83 psyke83 commented May 29, 2023

Description

Fixes error in Windows build after updating all msys2 packages:

D:\Software\msys64\mingw64\bin\c++.exe -DBOOST_ATOMIC_NO_LIB -DBOOST_CHRONO_NO_LIB -DBOOST_FILESYSTEM_NO_LIB -DBOOST_LOCALE_NO_LIB -DBOOST_LOG_NO_LIB -DBOOST_PROGRAM_OPTIONS_NO_LIB -DBOOST_REGEX_NO_LIB -DBOOST_THREAD_NO_LIB -DCURL_STATICLIB -DMINIUPNP_STATICLIB -DNDEBUG -DSUNSHINE_ASSETS_DIR=\"assets\" -DSUNSHINE_PLATFORM=\"windows\" -DSUNSHINE_TRAY=1 @CMakeFiles/sunshine.dir/includes_CXX.rsp -O3 -DNDEBUG -std=gnu++17 -Wall -Wno-sign-compare -MD -MT CMakeFiles/sunshine.dir/src/platform/windows/publish.cpp.obj -MF CMakeFiles\sunshine.dir\src\platform\windows\publish.cpp.obj.d -o CMakeFiles\sunshine.dir\src\platform\windows\publish.cpp.obj -c D:\Software\msys64\home\Conn\Sunshine\src\platform\windows\publish.cpp
In file included from D:/Software/msys64/mingw64/include/_mingw.h:10,
                 from D:/Software/msys64/mingw64/include/windows.h:9,
                 from D:/Software/msys64/mingw64/include/winsock2.h:23,
                 from D:\Software\msys64\home\Conn\Sunshine\src\platform\windows\publish.cpp:5:
D:\Software\msys64\home\Conn\Sunshine\src\platform\windows\publish.cpp:32:16: error: expected unqualified-id before numeric constant
   32 | constexpr auto DNS_REQUEST_PENDING = 9506L;
      |                ^~~~~~~~~~~~~~~~~~~
mingw32-make[2]: *** [CMakeFiles\sunshine.dir\build.make:366: CMakeFiles/sunshine.dir/src/platform/windows/publish.cpp.obj] Error 1

This definition is now included in the following header and package version:
/usr/include/w32api/winerror.h is owned by msys2-w32api-headers 11.0.1.r0.gc3e587c06-1

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@ReenigneArcher ReenigneArcher merged commit 72d63aa into LizardByte:nightly May 30, 2023
ns6089 pushed a commit to ns6089/Sunshine that referenced this pull request Jul 5, 2023
@psyke83 @ns6089
windows: fix header conflict for msys2-w32api-headers 11.0.1+ (Lizard…
8b7a6fc 
…Byte#1332)
@detiam detiam mentioned this pull request Jul 27, 2023
Closed
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
@psyke83
windows: fix header conflict for msys2-w32api-headers 11.0.1+ (Lizard…
0b62ae3 
…Byte#1332)
e-dong pushed a commit to e-dong/Sunshine that referenced this pull request Jul 26, 2024
@psyke83 @e-dong
windows: fix header conflict for msys2-w32api-headers 11.0.1+ (Lizard…
65440c5 
…Byte#1332)
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.
2 participants
@psyke83 @ReenigneArcher