From a0e5589edf49f6f43631ce4ee7458e2dce4994e5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 3 May 2016 19:28:48 +0200 Subject: hw/nxagent/Display.c: Define Pixmap from XlibPixmap before including Icons.h (which includes hw/nxagent/X11/include/xpm_nxagent.h). --- nx-X11/programs/Xserver/hw/nxagent/Display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 5586e82cd..960b8a1ad 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -62,7 +62,11 @@ is" without express or implied warranty. #include "Init.h" #include "Args.h" #include "Image.h" + +#define Pixmap XlibPixmap #include "Icons.h" +#undef Pixmap + #include "Render.h" #include "Font.h" #include "Reconnect.h" -- cgit v1.2.3