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/Xext | |
| 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/Xext')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.h | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shape.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shm.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvdisp.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 96a349add..094837d34 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -11,8 +11,7 @@ #ifdef SHAPE extern void ShapeExtensionInit(INITARGS); -#define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include <nx-X11/extensions/shapestr.h> +#include <X11/extensions/shapeproto.h> #endif #ifdef XTEST @@ -68,7 +67,7 @@ extern void ResExtensionInit(INITARGS); #ifdef SHM extern void ShmExtensionInit(INITARGS); -#include <nx-X11/extensions/shmstr.h> +#include <X11/extensions/shmproto.h> extern void ShmSetPixmapFormat( ScreenPtr pScreen, int format); diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 8516192c0..51fcd7d9f 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -44,8 +44,7 @@ in this Software without prior written authorization from The Open Group. #include "dixstruct.h" #include "resource.h" #include "opaque.h" -#define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include <nx-X11/extensions/shapestr.h> +#include <X11/extensions/shapeproto.h> #include "regionstr.h" #include "gcstruct.h" #ifdef EXTMODULE diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index 94d6b4ac1..bca8c2e0e 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group. #include "extnsionst.h" #include "servermd.h" #define _XSHM_SERVER_ -#include <nx-X11/extensions/shmstr.h> +#include <X11/extensions/shmstr.h> #include <nx-X11/Xfuncproto.h> #ifdef EXTMODULE #include "xf86_ansic.h" @@ -1319,4 +1319,4 @@ SProcShmDispatch (client) return BadRequest; } } -#endif /* NXAGENT_SERVER */
\ No newline at end of file +#endif /* NXAGENT_SERVER */ diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index ecd4f9a66..3bcb130c7 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -68,7 +68,7 @@ SOFTWARE. #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include <nx-X11/extensions/shmstr.h> +#include <X11/extensions/shmproto.h> #endif #ifdef EXTMODULE |