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/GL | |
| 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/GL')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/glx/glxserver.h | 6 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/glxserver.h b/nx-X11/programs/Xserver/GL/glx/glxserver.h index 193ebcb6f..4238de537 100644 --- a/nx-X11/programs/Xserver/GL/glx/glxserver.h +++ b/nx-X11/programs/Xserver/GL/glx/glxserver.h @@ -41,9 +41,9 @@ ** */ -#include <X11/X.h> -#include <X11/Xproto.h> -#include <X11/Xmd.h> +#include <nx-X11/X.h> +#include <nx-X11/Xproto.h> +#include <nx-X11/Xmd.h> #include <misc.h> #include <dixstruct.h> #include <pixmapstr.h> diff --git a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c index 6441a4b4f..1889bdabd 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c +++ b/nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c @@ -39,7 +39,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <gcstruct.h> #include "pixmapstr.h" #include "xf86glx_util.h" -#include <X11/Xmd.h> +#include <nx-X11/Xmd.h> #include "GL/xf86glx.h" #ifdef ROUNDUP |