diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:00:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:00:04 +0200 |
| commit | da7261cfe0244fcf329e0597f9d122293fd4f9eb (patch) | |
| tree | fe39b99fe89ac4fa65fec9c974379b5c52ada016 /nx-X11/programs/Xserver/hw/nxagent | |
| parent | 2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1 (diff) | |
| parent | 1cd7e35cbdd348f6a383ad4b5149c1f8d2ece0cf (diff) | |
| download | nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.tar.gz nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.tar.bz2 nx-libs-da7261cfe0244fcf329e0597f9d122293fd4f9eb.zip | |
Merge branch 'uli42-pr/drop_libNX_Xext' into 3.6.x
Attributes GH PR #175: https://github.com/ArcticaProject/nx-libs/pull/175
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Agent.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Render.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Agent.h b/nx-X11/programs/Xserver/hw/nxagent/Agent.h index ec312bad2..2fa2b6240 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Agent.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Agent.h @@ -104,7 +104,7 @@ typedef XID KeySym64; #define NX_TRANS_SOCKET #define GC XlibGC #include <nx-X11/Xlib.h> -#include <nx-X11/extensions/shape.h> +#include <X11/extensions/shape.h> #undef GC #ifdef _XSERVER64_tmp diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 72da2df19..866ab581c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -44,7 +44,7 @@ #undef Pixmap #include "region.h" -#include "extutil.h" +#include <X11/extensions/extutil.h> #include "Display.h" #include "Pixmaps.h" |