From 9618380bde0b1e9bdc757055b378d93cac9d377f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 29 Dec 2015 17:27:47 +0100
Subject: X11/nx-X11 clear-up: More places where we need to explicitly
 distinguish between X11 and nx-X11 namespace regarding header include paths.

---
 nx-X11/programs/Xserver/hw/nxagent/NXdamage.c                   | 2 +-
 nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
index 06f2de57c..d18840dad 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdamage.c
@@ -43,7 +43,7 @@
 #include <dix-config.h>
 #endif
 
-#include    <X11/X.h>
+#include    <nx-X11/X.h>
 #include    "scrnintstr.h"
 #include    "windowstr.h"
 #include    <X11/fonts/font.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
index 7515992a1..ea8dd12f8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h
@@ -51,7 +51,7 @@
 #ifndef _XRANDR_H_
 #define _XRANDR_H_
 
-#include <X11/extensions/randr.h>
+#include <nx-X11/extensions/randr.h>
 #include <nx-X11/Xfuncproto.h>
 
 _XFUNCPROTOBEGIN
-- 
cgit v1.2.3