And use it instead of USER_DRIVER.
Signed-off-by: Jacek Caban jacek@codeweavers.com --- dlls/user32/driver.c | 24 +++++++-------- dlls/user32/painting.c | 9 ++---- dlls/user32/sysparams.c | 1 - dlls/user32/user_private.h | 56 ++-------------------------------- dlls/user32/win.c | 6 +--- dlls/user32/winpos.c | 9 ++---- include/wine/gdi_driver.h | 61 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 78 insertions(+), 88 deletions(-)
On Wed, Nov 10, 2021 at 01:33:01PM +0100, Jacek Caban wrote:
And use it instead of USER_DRIVER.
Signed-off-by: Jacek Caban jacek@codeweavers.com
dlls/user32/driver.c | 24 +++++++-------- dlls/user32/painting.c | 9 ++---- dlls/user32/sysparams.c | 1 - dlls/user32/user_private.h | 56 ++-------------------------------- dlls/user32/win.c | 6 +--- dlls/user32/winpos.c | 9 ++---- include/wine/gdi_driver.h | 61 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 78 insertions(+), 88 deletions(-)
Hi Jacek,
This is causing a build failure on macOS:
gcc -m32 -c -o dlls/winemac.drv/mouse.o dlls/winemac.drv/mouse.c -Idlls/winemac.drv -Iinclude -D__WINESRC__ -fPIC \ -fasynchronous-unwind-tables -Wall -pipe -fno-stack-protector -fno-strict-aliasing \ -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Winit-self -Wno-pragma-pack \ -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith -gdwarf-2 -gstrict-dwarf \ -fno-omit-frame-pointer -O2 -g -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 dlls/winemac.drv/mouse.c:55:7: error: use of undeclared identifier 'OCR_NORMAL' { OCR_NORMAL, CFSTR("arrowCursor") }, ^ dlls/winemac.drv/mouse.c:56:7: error: use of undeclared identifier 'OCR_IBEAM' { OCR_IBEAM, CFSTR("IBeamCursor") }, ^
I would have fixed this up myself (the fix is actually in [2/5]), but there were other issues with [2/5].
Huw.
-
Huw Davies -
Jacek Caban