Merge branch 'sunweaver-pr/move-nxcompext-into-Xserver' into 3.6.x

Attributes GH PR: https://github.com/ArcticaProject/nx-libs/pull/277

Reviewed by: Ulrich Sibiller <uli42@gmx.de>  -- Tue, 15 Nov 2016 00:54:44 -0800

1 files changed, 4 insertions, 4 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
index 36244c4a3..1721be9fb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c
@@ -41,7 +41,7 @@
 #include "Millis.h"
 
 #define Window XlibWindow
-#include <nx/NXlib.h>
+#include "compext/Compext.h"
 #undef Window
 
 #include <nx/Shadow.h>
@@ -992,14 +992,14 @@ void nxagentHandleCollectInputFocusEvent(int resource)
    * While we don't even need window or revert_to later on, a discrepancy in
    * data type sizes between the X server (Window being a 32bit ID) and
    * the Xlib (Window being a 64bit ID) will lead to stack corruption here.
-   * Calling functions from nxcompext from nxagent sounds like a very bad idea
+   * Calling functions from CompExt from nxagent sounds like a very bad idea
    * to begin with, but let's assume that's necessary for now and work around
    * the corruption issue.
    *
-   * Even though the NXlib header shows that the function expects a Window-sized
+   * Even though the CompExt header shows that the function expects a Window-sized
    * parameter, it's not the Window type as defined and used within the X.Org
    * Server, but an Xlib type. Hence, we'll be using the "XlibWindow" type here
-   * and to avoid compiler warnings, "rewrite" the NXlib.h header file via
+   * and to avoid compiler warnings, "rewrite" the CompExt.h header file via
    * overriding the original "Window" type with the XlibWindow type, including
    * the header file and undefining the macro again, essentially unshadowing
    * the original type.