hw/nxagent/Display.c: Define Pixmap from XlibPixmap before including Icons.h…

hw/nxagent/Display.c: Define Pixmap from XlibPixmap before including Icons.h (which includes hw/nxagent/X11/include/xpm_nxagent.h).

hw/nxagent/Display.c: Define Pixmap from XlibPixmap before including Icons.h…
a0e5589e · Mike Gabriel · e79fe3b9 · a0e5589e
Commit a0e5589e authored May 03, 2016 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Display.c nx-X11/programs/Xserver/hw/nxagent/Display.c +4 -0

No files found.
--- 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"