diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:17:21 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 13:17:21 +0100 |
commit | ca0f639a4ef9ad605f0e62577c84f2be73807ff3 (patch) | |
tree | 1f13c31901460fd31786b6d50b6c9841d25be99e /nx-X11/programs/Xserver/Xext/extmod | |
parent | f58006d932d907dc13d76084e9171de59ee27f16 (diff) | |
parent | 433d8186588698ce6a435fbff5e9d40a37b78be9 (diff) | |
download | nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.gz nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.tar.bz2 nx-libs-ca0f639a4ef9ad605f0e62577c84f2be73807ff3.zip |
Merge branch 'sunweaver-pr/NX-include-path' into 3.6.x
Attributes GH PR #61: https://github.com/ArcticaProject/nx-libs/pull/61
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/extmod')
-rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/Xext/extmod/modinit.h | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c index f79204281..162f76ad8 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.c @@ -33,7 +33,7 @@ #include "xf86Module.h" #include "xf86Opt.h" -#include <X11/Xproto.h> +#include <nx-X11/Xproto.h> #include "modinit.h" #include "globals.h" diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h index 2bafdb2b0..40e1828bb 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h @@ -12,26 +12,26 @@ #ifdef SHAPE extern void ShapeExtensionInit(INITARGS); #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include <X11/extensions/shapestr.h> +#include <nx-X11/extensions/shapestr.h> #endif #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include <X11/extensions/multibufst.h> +#include <nx-X11/extensions/multibufst.h> #endif #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); #define _MITMISC_SERVER_ -#include <X11/extensions/mitmiscstr.h> +#include <nx-X11/extensions/mitmiscstr.h> #endif #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ -#include <X11/extensions/XTest.h> -#include <X11/extensions/xteststr.h> +#include <nx-X11/extensions/XTest.h> +#include <nx-X11/extensions/xteststr.h> #endif #if 1 @@ -40,49 +40,49 @@ extern void XTestExtension1Init(INITARGS); #ifdef BIGREQS extern void BigReqExtensionInit(INITARGS); -#include <X11/extensions/bigreqstr.h> +#include <nx-X11/extensions/bigreqstr.h> #endif #ifdef XSYNC extern void SyncExtensionInit(INITARGS); #define _SYNC_SERVER -#include <X11/extensions/sync.h> -#include <X11/extensions/syncstr.h> +#include <nx-X11/extensions/sync.h> +#include <nx-X11/extensions/syncstr.h> #endif #ifdef SCREENSAVER extern void ScreenSaverExtensionInit (INITARGS); -#include <X11/extensions/saver.h> +#include <nx-X11/extensions/saver.h> #endif #ifdef XCMISC extern void XCMiscExtensionInit(INITARGS); -#include <X11/extensions/xcmiscstr.h> +#include <nx-X11/extensions/xcmiscstr.h> #endif #ifdef XF86VIDMODE extern void XFree86VidModeExtensionInit(INITARGS); #define _XF86VIDMODE_SERVER_ -#include <X11/extensions/xf86vmstr.h> +#include <nx-X11/extensions/xf86vmstr.h> #endif #ifdef XF86MISC extern void XFree86MiscExtensionInit(INITARGS); #define _XF86MISC_SERVER_ #define _XF86MISC_SAVER_COMPAT_ -#include <X11/extensions/xf86mscstr.h> +#include <nx-X11/extensions/xf86mscstr.h> #endif #ifdef XFreeXDGA extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGARegister(INITARGS); #define _XF86DGA_SERVER_ -#include <X11/extensions/xf86dgastr.h> +#include <nx-X11/extensions/xf86dgastr.h> #endif #ifdef DPMSExtension extern void DPMSExtensionInit(INITARGS); -#include <X11/extensions/dpmsstr.h> +#include <nx-X11/extensions/dpmsstr.h> #endif #ifdef FONTCACHE @@ -95,31 +95,31 @@ extern void FontCacheExtensionInit(INITARGS); #ifdef TOGCUP extern void XcupExtensionInit(INITARGS); #define _XCUP_SERVER_ -#include <X11/extensions/Xcupstr.h> +#include <nx-X11/extensions/Xcupstr.h> #endif #ifdef EVI extern void EVIExtensionInit(INITARGS); #define _XEVI_SERVER_ -#include <X11/extensions/XEVIstr.h> +#include <nx-X11/extensions/XEVIstr.h> #endif #ifdef XV extern void XvExtensionInit(INITARGS); extern void XvMCExtensionInit(INITARGS); extern void XvRegister(INITARGS); -#include <X11/extensions/Xv.h> -#include <X11/extensions/XvMC.h> +#include <nx-X11/extensions/Xv.h> +#include <nx-X11/extensions/XvMC.h> #endif #ifdef RES extern void ResExtensionInit(INITARGS); -#include <X11/extensions/XResproto.h> +#include <nx-X11/extensions/XResproto.h> #endif #ifdef SHM extern void ShmExtensionInit(INITARGS); -#include <X11/extensions/shmstr.h> +#include <nx-X11/extensions/shmstr.h> extern void ShmSetPixmapFormat( ScreenPtr pScreen, int format); |