Skip to content

N
nx-libs
Commit ee60cc50 authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

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
parent 57e662b8
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
nx-X11/programs/Xserver/hw/nxagent/Window.c
View file @ ee60cc50
...@@ -3089,8 +3089,8 @@ static void nxagentReconnectWindow(void * param0, XID param1, void * data_buffer ...@@ -3089,8 +3089,8 @@ static void nxagentReconnectWindow(void * param0, XID param1, void * data_buffer
/* FIXME: use XAllocSizeHints() */ /* FIXME: use XAllocSizeHints() */
#ifdef _XSERVER64 #ifdef _XSERVER64
data64 = (unsigned char *) malloc(sizeof(XSizeHints) + 4); data64 = (unsigned char *) malloc(sizeof(XSizeHints) + 4);
if (data64) if (data64)
{ {
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
*(data64 + i) = *(data + i); *(data64 + i) = *(data + i);
...@@ -3104,18 +3104,18 @@ static void nxagentReconnectWindow(void * param0, XID param1, void * data_buffer ...@@ -3104,18 +3104,18 @@ static void nxagentReconnectWindow(void * param0, XID param1, void * data_buffer
} }
XSizeHints *props = (XSizeHints *) data64; XSizeHints *props = (XSizeHints *) data64;
#else
XSizeHints *props = (XSizeHints *) data;
#endif /* _XSERVER64 */
hints = *props; hints = *props;
} }
else else
{ {
#ifdef WARNING #ifdef WARNING
fprintf(stderr, "%s: Failed to alloc memory for XSizeHints\n", __func__); fprintf(stderr, "%s: Failed to alloc memory for XSizeHints\n", __func__);
#endif #endif
} }
#else
XSizeHints *props = (XSizeHints *) data;
hints = *props;
#endif /* _XSERVER64 */
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment