Commit bb9ac3fd authored by Mike Gabriel's avatar Mike Gabriel

hw/nxagent/Splash.c Fix build on 32bit architecture.

Regression fix for 427b7b97. As suggested by Ulrich Sibiller. Fixes ArcticaProject/nx-libs#891.
parent 67599026
......@@ -26,14 +26,8 @@
#include "windowstr.h"
#include "scrnintstr.h"
#ifdef _XSERVER64
#include "Agent.h"
#define GC XlibGC
#endif /* _XSERVER64 */
#include "Xlib.h"
#include "Xutil.h"
......@@ -67,14 +61,13 @@ Pixmap nxagentPixmapLogo;
Window nxagentSplashWindow = None;
Bool nxagentWMPassed = False;
static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height);
static void nxagentPaintLogo(Window win, XlibGC gc, int scale, int width, int height);
void nxagentShowSplashWindow(Window parentWindow)
{
XWindowAttributes getAttributes;
XWindowChanges values;
XSetWindowAttributes attributes;
GC gc;
/*
* Show splash window only when running as X2Go Agent
......@@ -149,7 +142,7 @@ void nxagentShowSplashWindow(Window parentWindow)
nxagentSplashWindow);
#endif
gc = XCreateGC(nxagentDisplay, nxagentSplashWindow, 0, NULL);
XlibGC gc = XCreateGC(nxagentDisplay, nxagentSplashWindow, 0, NULL);
nxagentPaintLogo(nxagentSplashWindow, gc, 1, getAttributes.width, getAttributes.height);
XMapRaised (nxagentDisplay, nxagentSplashWindow);
values.stack_mode = Above;
......@@ -167,7 +160,7 @@ void nxagentShowSplashWindow(Window parentWindow)
#endif
}
void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height)
void nxagentPaintLogo(Window win, XlibGC gc, int scale, int width, int height)
{
int depth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay));
......
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