diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2021-01-30 16:10:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-02-03 14:52:53 +0100 |
| commit | 19b639b910fadac9ef24ec1ef9bf774ad4e78a71 (patch) | |
| tree | faee20df22d77e3167e8ac38c7b73a0dd813885d | |
| parent | 150e9bda9f47e004291f169e7493500cc5b0be74 (diff) | |
| download | nx-libs-19b639b910fadac9ef24ec1ef9bf774ad4e78a71.tar.gz nx-libs-19b639b910fadac9ef24ec1ef9bf774ad4e78a71.tar.bz2 nx-libs-19b639b910fadac9ef24ec1ef9bf774ad4e78a71.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
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 20 |
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 { |