mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10678 from akallabeth/compile-fix

Browse Source 
Compile fix
This commit is contained in:
Martin Fleisz 2024-09-25 10:52:33 +02:00 committed by GitHub
commit 64bf1c9a97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/X11/xf_window.c
View File

@ -502,14 +502,15 @@ static BOOL xf_GetNumberOfDesktops(xfContext* xfc, Window root, unsigned* pval)
{
unsigned long nitems = 0;
unsigned long bytes = 0;
long* prop = NULL;
BYTE* bprop = NULL;
WINPR_ASSERT(xfc);
WINPR_ASSERT(pval);
const BOOL rc =
xf_GetWindowProperty(xfc, root, xfc->_NET_NUMBER_OF_DESKTOPS, 1, &nitems, &bytes, &prop);
xf_GetWindowProperty(xfc, root, xfc->_NET_NUMBER_OF_DESKTOPS, 1, &nitems, &bytes, &bprop);
long* prop = (long*)bprop;
*pval = 0;
if (!rc)
return FALSE;
@ -523,7 +524,7 @@ static BOOL xf_GetCurrentDesktop(xfContext* xfc, Window root)
{
unsigned long nitems = 0;
unsigned long bytes = 0;
long* prop = NULL;
BYTE* bprop = NULL;
unsigned max = 0;
if (!xf_GetNumberOfDesktops(xfc, root, &max))
@ -532,8 +533,9 @@ static BOOL xf_GetCurrentDesktop(xfContext* xfc, Window root)
return FALSE;
const BOOL rc =
xf_GetWindowProperty(xfc, root, xfc->_NET_CURRENT_DESKTOP, 1, &nitems, &bytes, &prop);
xf_GetWindowProperty(xfc, root, xfc->_NET_CURRENT_DESKTOP, 1, &nitems, &bytes, &bprop);
long* prop = (long*)bprop;
xfc->current_desktop = 0;
if (!rc)
return FALSE;
@ -548,10 +550,11 @@ static BOOL xf_GetWorkArea_NET_WORKAREA(xfContext* xfc, Window root)
BOOL rc = FALSE;
unsigned long nitems = 0;
unsigned long bytes = 0;
long* prop = NULL;
BYTE* bprop = NULL;
const BOOL status =
xf_GetWindowProperty(xfc, root, xfc->_NET_WORKAREA, INT_MAX, &nitems, &bytes, &prop);
xf_GetWindowProperty(xfc, root, xfc->_NET_WORKAREA, INT_MAX, &nitems, &bytes, &bprop);
long* prop = (long*)bprop;
if (!status)
goto fail;

2
cmake/CXXCompilerFlags.cmake
View File

@ -9,7 +9,7 @@ macro (checkCXXFlag FLAG)
endif()
endmacro()
option(ENABLE_WARNING_VERBOSE "enable -Weveryting (and some exceptions) for compile" ON)
option(ENABLE_WARNING_VERBOSE "enable -Weveryting (and some exceptions) for compile" OFF)
option(ENABLE_WARNING_ERROR "enable -Werror for compile" OFF)
if (ENABLE_WARNING_VERBOSE)

2
cmake/CompilerFlags.cmake
View File

@ -9,7 +9,7 @@ macro (checkCFlag FLAG)
endif()
endmacro()
option(ENABLE_WARNING_VERBOSE "enable -Weveryting (and some exceptions) for compile" ON)
option(ENABLE_WARNING_VERBOSE "enable -Weveryting (and some exceptions) for compile" OFF)
option(ENABLE_WARNING_ERROR "enable -Werror for compile" OFF)
if (ENABLE_WARNING_VERBOSE)