[X2Go-Commits] [nx-libs] 215/429: Window.c: Fix 32bit code path

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit ee60cc50cb3c9fb3844fb5b6bd330f636213ee7d
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sat Jan 30 16:10:14 2021 +0100

    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
---
 nx-X11/programs/Xserver/hw/nxagent/Window.c | 20 ++++++++++----------
 1 file 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
       {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git