aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Window.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2021-01-30 16:10:14 +0100
committerUlrich Sibiller <uli42@gmx.de>2021-01-30 16:10:14 +0100
commitee60cc50cb3c9fb3844fb5b6bd330f636213ee7d (patch)
tree8816c91c85298d72e3b416904233f32327c457ff /nx-X11/programs/Xserver/hw/nxagent/Window.c
parent57e662b83d31344b331d5035d02f7ab26a9eeaad (diff)
downloadnx-libs-ee60cc50cb3c9fb3844fb5b6bd330f636213ee7d.tar.gz
nx-libs-ee60cc50cb3c9fb3844fb5b6bd330f636213ee7d.tar.bz2
nx-libs-ee60cc50cb3c9fb3844fb5b6bd330f636213ee7d.zip
Window.c: Fix 32bit code path
make it compile again Thanks to Simon Matter for reporting this and the patch. Fixes ArcticaProject/nx-libs#993
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index adf54b717..ba93c96cb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -3089,8 +3089,8 @@ static void nxagentReconnectWindow(void * param0, XID param1, void * data_buffer
/* FIXME: use XAllocSizeHints() */
#ifdef _XSERVER64
data64 = (unsigned char *) malloc(sizeof(XSizeHints) + 4);
- if (data64)
- {
+ if (data64)
+ {
for (int i = 0; i < 4; i++)
{
*(data64 + i) = *(data + i);
@@ -3104,18 +3104,18 @@ static void nxagentReconnectWindow(void * param0, XID param1, void * data_buffer
}
XSizeHints *props = (XSizeHints *) data64;
- #else
- XSizeHints *props = (XSizeHints *) data;
- #endif /* _XSERVER64 */
-
hints = *props;
- }
- else
- {
+ }
+ else
+ {
#ifdef WARNING
fprintf(stderr, "%s: Failed to alloc memory for XSizeHints\n", __func__);
#endif
- }
+ }
+ #else
+ XSizeHints *props = (XSizeHints *) data;
+ hints = *props;
+ #endif /* _XSERVER64 */
}
else
{