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/render | |
| 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/render')
| -rw-r--r-- | nx-X11/programs/Xserver/render/animcur.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/render/glyphstr.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/render/render.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/render/animcur.c b/nx-X11/programs/Xserver/render/animcur.c index 15293af64..27e5ab949 100644 --- a/nx-X11/programs/Xserver/render/animcur.c +++ b/nx-X11/programs/Xserver/render/animcur.c @@ -36,8 +36,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" diff --git a/nx-X11/programs/Xserver/render/glyphstr.h b/nx-X11/programs/Xserver/render/glyphstr.h index e9bbd19b0..f27a73fbb 100644 --- a/nx-X11/programs/Xserver/render/glyphstr.h +++ b/nx-X11/programs/Xserver/render/glyphstr.h @@ -26,7 +26,7 @@ #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ -#include <X11/extensions/renderproto.h> +#include <nx-X11/extensions/renderproto.h> #include "picture.h" #include "screenint.h" diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c index 8d644b35e..2dedbc9c4 100644 --- a/nx-X11/programs/Xserver/render/render.c +++ b/nx-X11/programs/Xserver/render/render.c @@ -30,8 +30,8 @@ #include <dix-config.h> #endif -#include <X11/X.h> -#include <X11/Xproto.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -42,11 +42,11 @@ #include "colormapst.h" #include "extnsionst.h" #include "servermd.h" -#include <X11/extensions/render.h> -#include <X11/extensions/renderproto.h> +#include <nx-X11/extensions/render.h> +#include <nx-X11/extensions/renderproto.h> #include "picturestr.h" #include "glyphstr.h" -#include <X11/Xfuncproto.h> +#include <nx-X11/Xfuncproto.h> #include "cursorstr.h" #ifdef EXTMODULE #include "xf86_ansic.h" |