diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-07-01 13:54:10 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-07-01 15:56:28 +0200 |
| commit | e78c5bc3c2df117b4c8e5e4bd24c985cd89c49ad (patch) | |
| tree | 464b1f4d30d5e9aaacde9ae75c8f24497195b169 /nx-X11/programs | |
| parent | 232c7ad9146ce372afc2a1682dd01e3d65916c53 (diff) | |
| download | nx-libs-e78c5bc3c2df117b4c8e5e4bd24c985cd89c49ad.tar.gz nx-libs-e78c5bc3c2df117b4c8e5e4bd24c985cd89c49ad.tar.bz2 nx-libs-e78c5bc3c2df117b4c8e5e4bd24c985cd89c49ad.zip | |
remove shm code from libNX_Xext
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shm.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvdisp.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miscrinit.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 24cef286b..094837d34 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -67,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/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 diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index b58202ebd..dcd91c5e0 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -158,7 +158,7 @@ typedef void (*InitExtension)(INITARGS); #ifdef MITSHM #define _XSHM_SERVER_ -#include <nx-X11/extensions/shmstr.h> +#include <X11/extensions/shmproto.h> #endif #ifdef XTEST #define _XTEST_SERVER_ diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c index addd5dd64..da80932ad 100644 --- a/nx-X11/programs/Xserver/mi/miscrinit.c +++ b/nx-X11/programs/Xserver/mi/miscrinit.c @@ -42,7 +42,7 @@ from The Open Group. #include "miline.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include <nx-X11/extensions/XShm.h> +#include <X11/extensions/XShm.h> #endif /* We use this structure to propogate some information from miScreenInit to |