diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-03 19:28:48 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-05-13 05:30:03 +0200 |
| commit | a0e5589edf49f6f43631ce4ee7458e2dce4994e5 (patch) | |
| tree | ce1ddeec08f97e9beccd81b76ae795d08e28a5ee /nx-X11/programs/Xserver | |
| parent | e79fe3b9a1d04ba4d3c16680ce39b1bd5cdb0607 (diff) | |
| download | nx-libs-a0e5589edf49f6f43631ce4ee7458e2dce4994e5.tar.gz nx-libs-a0e5589edf49f6f43631ce4ee7458e2dce4994e5.tar.bz2 nx-libs-a0e5589edf49f6f43631ce4ee7458e2dce4994e5.zip | |
hw/nxagent/Display.c: Define Pixmap from XlibPixmap before including Icons.h (which includes hw/nxagent/X11/include/xpm_nxagent.h).
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Display.c | 4 |
1 files changed, 4 insertions, 0 deletions
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" |