Winelib build fails to compile due to timeval redefinition (workaround included)
aqxa1 opened this issue · 2 comments
Software information
Winelib build fails to compile with current D9VK git. With the following errors:
In file included from /usr/include/wine-staging-4.20/wine/windows/windows.h:64,
from ../src/dxvk/../util/util_time.h:8,
from ../src/dxvk/hud/dxvk_hud_stats.h:3,
from ../src/dxvk/hud/dxvk_hud_stats.cpp:1:
/usr/include/wine-staging-4.20/wine/windows/winsock.h:445:16: error: redefinition of ‘struct timeval’
445 | typedef struct WS(timeval)
System information
- GPU: Navi 5700 XT
- Driver: mesa-git
- Wine version: wine-staging-4.20
- D9VK version: 278434a
Workaround patch
I'm not sure if there are any side effects to this (I wouldn't think D9VK would use winsock). I also tried setting_TIMEVAL_DEFINED, but Wine's winsock.h undefines it before setting it's own value (which causes the problem).
There is a fix for this upstream already, just need to rebase.
Yeah, just noticed myself.