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/lib/Xext | |
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/lib/Xext')
-rw-r--r-- | nx-X11/lib/Xext/DPMS.c | 10 | ||||
-rw-r--r-- | nx-X11/lib/Xext/MITMisc.c | 10 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XAppgroup.c | 10 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XEVI.c | 12 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XLbx.c | 10 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XMultibuf.c | 8 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XSecurity.c | 8 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XShape.c | 12 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XShm.c | 12 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XSync.c | 8 | ||||
-rw-r--r-- | nx-X11/lib/Xext/XTestExt1.c | 6 | ||||
-rw-r--r-- | nx-X11/lib/Xext/Xcup.c | 10 | ||||
-rw-r--r-- | nx-X11/lib/Xext/Xdbe.c | 8 | ||||
-rw-r--r-- | nx-X11/lib/Xext/extutil.c | 6 | ||||
-rw-r--r-- | nx-X11/lib/Xext/globals.c | 4 |
15 files changed, 67 insertions, 67 deletions
diff --git a/nx-X11/lib/Xext/DPMS.c b/nx-X11/lib/Xext/DPMS.c index 35b21b4ad..a2c0dc3c5 100644 --- a/nx-X11/lib/Xext/DPMS.c +++ b/nx-X11/lib/Xext/DPMS.c @@ -36,11 +36,11 @@ Equipment Corporation. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/extensions/dpms.h> -#include <X11/extensions/dpmsstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/dpms.h> +#include <nx-X11/extensions/dpmsstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> #include <stdio.h> static XExtensionInfo _dpms_info_data; diff --git a/nx-X11/lib/Xext/MITMisc.c b/nx-X11/lib/Xext/MITMisc.c index c0fa87209..8ba35dce1 100644 --- a/nx-X11/lib/Xext/MITMisc.c +++ b/nx-X11/lib/Xext/MITMisc.c @@ -32,11 +32,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/extensions/MITMisc.h> -#include <X11/extensions/mitmiscstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/MITMisc.h> +#include <nx-X11/extensions/mitmiscstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> static XExtensionInfo _mit_info_data; static XExtensionInfo *mit_info = &_mit_info_data; diff --git a/nx-X11/lib/Xext/XAppgroup.c b/nx-X11/lib/Xext/XAppgroup.c index 2ca3e4d21..abbf1c1b9 100644 --- a/nx-X11/lib/Xext/XAppgroup.c +++ b/nx-X11/lib/Xext/XAppgroup.c @@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xwindows.h> +#include <nx-X11/Xwindows.h> #endif #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/Xagstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xagstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> #include <stdarg.h> diff --git a/nx-X11/lib/Xext/XEVI.c b/nx-X11/lib/Xext/XEVI.c index a64b9c1ba..e5a811bdf 100644 --- a/nx-X11/lib/Xext/XEVI.c +++ b/nx-X11/lib/Xext/XEVI.c @@ -27,12 +27,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/extensions/XEVI.h> -#include <X11/extensions/XEVIstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/Xutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/XEVI.h> +#include <nx-X11/extensions/XEVIstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/Xutil.h> static XExtensionInfo *xevi_info;/* needs to move to globals.c */ static /* const */ char *xevi_extension_name = EVINAME; #define XeviCheckExtension(dpy,i,val) \ diff --git a/nx-X11/lib/Xext/XLbx.c b/nx-X11/lib/Xext/XLbx.c index 8c0cfad0b..450bd5bc5 100644 --- a/nx-X11/lib/Xext/XLbx.c +++ b/nx-X11/lib/Xext/XLbx.c @@ -30,11 +30,11 @@ #include <config.h> #endif #include <stdio.h> -#include <X11/Xlibint.h> -#include <X11/extensions/XLbx.h> -#include <X11/extensions/lbxstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/XLbx.h> +#include <nx-X11/extensions/lbxstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> static XExtensionInfo _lbx_info_data; static XExtensionInfo *lbx_info = &_lbx_info_data; diff --git a/nx-X11/lib/Xext/XMultibuf.c b/nx-X11/lib/Xext/XMultibuf.c index 3e0049e92..570676def 100644 --- a/nx-X11/lib/Xext/XMultibuf.c +++ b/nx-X11/lib/Xext/XMultibuf.c @@ -32,11 +32,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> +#include <nx-X11/Xlibint.h> #include <stdio.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/multibufst.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/multibufst.h> static XExtensionInfo _multibuf_info_data; static XExtensionInfo *multibuf_info = &_multibuf_info_data; diff --git a/nx-X11/lib/Xext/XSecurity.c b/nx-X11/lib/Xext/XSecurity.c index 161ade3b7..a9899916f 100644 --- a/nx-X11/lib/Xext/XSecurity.c +++ b/nx-X11/lib/Xext/XSecurity.c @@ -29,11 +29,11 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> +#include <nx-X11/Xlibint.h> #include <stdio.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/securstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/securstr.h> static XExtensionInfo _Security_info_data; static XExtensionInfo *Security_info = &_Security_info_data; diff --git a/nx-X11/lib/Xext/XShape.c b/nx-X11/lib/Xext/XShape.c index 29a7f83f9..79b4b78f6 100644 --- a/nx-X11/lib/Xext/XShape.c +++ b/nx-X11/lib/Xext/XShape.c @@ -31,12 +31,12 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/Xregion.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/shapestr.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/Xregion.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/shapestr.h> static XExtensionInfo _shape_info_data; static XExtensionInfo *shape_info = &_shape_info_data; diff --git a/nx-X11/lib/Xext/XShm.c b/nx-X11/lib/Xext/XShm.c index f4e29a42b..ec3720732 100644 --- a/nx-X11/lib/Xext/XShm.c +++ b/nx-X11/lib/Xext/XShm.c @@ -36,12 +36,12 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlibint.h> -#include <X11/ImUtil.h> -#include <X11/extensions/XShm.h> -#include <X11/extensions/shmstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/ImUtil.h> +#include <nx-X11/extensions/XShm.h> +#include <nx-X11/extensions/shmstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> static XExtensionInfo _shm_info_data; static XExtensionInfo *shm_info = &_shm_info_data; diff --git a/nx-X11/lib/Xext/XSync.c b/nx-X11/lib/Xext/XSync.c index 61f8600ce..39eb97cdd 100644 --- a/nx-X11/lib/Xext/XSync.c +++ b/nx-X11/lib/Xext/XSync.c @@ -58,10 +58,10 @@ PERFORMANCE OF THIS SOFTWARE. #include <stdio.h> #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <X11/extensions/syncstr.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> +#include <nx-X11/extensions/syncstr.h> static XExtensionInfo _sync_info_data; static XExtensionInfo *sync_info = &_sync_info_data; diff --git a/nx-X11/lib/Xext/XTestExt1.c b/nx-X11/lib/Xext/XTestExt1.c index ee4a0bde0..00da036bd 100644 --- a/nx-X11/lib/Xext/XTestExt1.c +++ b/nx-X11/lib/Xext/XTestExt1.c @@ -64,9 +64,9 @@ University of California. #include <config.h> #endif #include <stdio.h> -#include <X11/Xproto.h> -#include <X11/Xlibint.h> -#include <X11/extensions/xtestext1.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/xtestext1.h> /****************************************************************************** * variables diff --git a/nx-X11/lib/Xext/Xcup.c b/nx-X11/lib/Xext/Xcup.c index 6315d32a4..8bf2bb29e 100644 --- a/nx-X11/lib/Xext/Xcup.c +++ b/nx-X11/lib/Xext/Xcup.c @@ -30,15 +30,15 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xwindows.h> +#include <nx-X11/Xwindows.h> #endif #define NEED_EVENTS #define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/Xcupstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xcupstr.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> static XExtensionInfo _xcup_info_data; static XExtensionInfo *xcup_info = &_xcup_info_data; diff --git a/nx-X11/lib/Xext/Xdbe.c b/nx-X11/lib/Xext/Xdbe.c index 954c8f01d..05df171f6 100644 --- a/nx-X11/lib/Xext/Xdbe.c +++ b/nx-X11/lib/Xext/Xdbe.c @@ -38,11 +38,11 @@ #include <config.h> #endif #include <stdio.h> -#include <X11/Xlibint.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> #define NEED_DBE_PROTOCOL -#include <X11/extensions/Xdbe.h> +#include <nx-X11/extensions/Xdbe.h> static XExtensionInfo _dbe_info_data; static XExtensionInfo *dbe_info = &_dbe_info_data; diff --git a/nx-X11/lib/Xext/extutil.c b/nx-X11/lib/Xext/extutil.c index d96b17f3f..bd79dbdb2 100644 --- a/nx-X11/lib/Xext/extutil.c +++ b/nx-X11/lib/Xext/extutil.c @@ -51,9 +51,9 @@ in this Software without prior written authorization from The Open Group. #include <config.h> #endif #include <stdio.h> -#include <X11/Xlibint.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/extensions/Xext.h> +#include <nx-X11/extensions/extutil.h> /* diff --git a/nx-X11/lib/Xext/globals.c b/nx-X11/lib/Xext/globals.c index 0cd5d2690..53a18690d 100644 --- a/nx-X11/lib/Xext/globals.c +++ b/nx-X11/lib/Xext/globals.c @@ -34,8 +34,8 @@ from The Open Group. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/Xlib.h> -#include <X11/extensions/Xext.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/extensions/Xext.h> #include <stddef.h> /* for definition of NULL */ /* |