diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-01 00:05:30 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-07-01 15:56:28 +0200 |
| commit | e77e37ff0f97a5845fa0c634e978361541d7991f (patch) | |
| tree | b97772d2c478eec4cba86c12241c59dd185fa3e1 /nx-X11/programs/Xserver/Xext | |
| parent | 2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1 (diff) | |
| download | nx-libs-e77e37ff0f97a5845fa0c634e978361541d7991f.tar.gz nx-libs-e77e37ff0f97a5845fa0c634e978361541d7991f.tar.bz2 nx-libs-e77e37ff0f97a5845fa0c634e978361541d7991f.zip | |
remove XShape code from libNX_Xext
use system libXext instead
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.h | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shape.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 96a349add..24cef286b 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 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 |