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/Xcomposite | |
| 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/Xcomposite')
| -rw-r--r-- | nx-X11/lib/Xcomposite/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/lib/Xcomposite/Xcomposite.h | 6 | ||||
| -rw-r--r-- | nx-X11/lib/Xcomposite/xcompositeint.h | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile index a8e4077fa..24820c146 100644 --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile @@ -16,7 +16,7 @@ SOXCOMPOSITEREV=1.0.0 #define LibName NX_Xcomposite #define SoRev SOXCOMPOSITEREV -#define IncSubdir X11 +#define IncSubdir nx-X11 #define IncSubSubdir extensions #include <Threads.tmpl> diff --git a/nx-X11/lib/Xcomposite/Xcomposite.h b/nx-X11/lib/Xcomposite/Xcomposite.h index 3604141bb..c28cc6857 100644 --- a/nx-X11/lib/Xcomposite/Xcomposite.h +++ b/nx-X11/lib/Xcomposite/Xcomposite.h @@ -25,9 +25,9 @@ #ifndef _XCOMPOSITE_H_ #define _XCOMPOSITE_H_ -#include <X11/extensions/composite.h> -#include <X11/extensions/Xfixes.h> -#include <X11/Xfuncproto.h> +#include <nx-X11/extensions/composite.h> +#include <nx-X11/extensions/Xfixes.h> +#include <nx-X11/Xfuncproto.h> /* * This revision number also appears in configure.ac, they have diff --git a/nx-X11/lib/Xcomposite/xcompositeint.h b/nx-X11/lib/Xcomposite/xcompositeint.h index af5f57500..7b12e8d55 100644 --- a/nx-X11/lib/Xcomposite/xcompositeint.h +++ b/nx-X11/lib/Xcomposite/xcompositeint.h @@ -28,11 +28,11 @@ #define NEED_EVENTS #define NEED_REPLIES #include <stdio.h> -#include <X11/Xlib.h> -#include <X11/Xlibint.h> -#include <X11/Xutil.h> -#include <X11/extensions/compositeproto.h> -#include <X11/extensions/Xcomposite.h> +#include <nx-X11/Xlib.h> +#include <nx-X11/Xlibint.h> +#include <nx-X11/Xutil.h> +#include <nx-X11/extensions/compositeproto.h> +#include <nx-X11/extensions/Xcomposite.h> typedef struct _XCompositeExtDisplayInfo { struct _XCompositeExtDisplayInfo *next; /* keep a linked list */ |