Merge branch 'uli42-pr/enableclientids' into 3.6.x

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

Merge branch 'uli42-pr/enableclientids' into 3.6.x
3dc45955 · Mike Gabriel · 7392dd6a · 71abe0be · 3dc45955 · 3dc45955
Unverified Commit 3dc45955 authored Oct 22, 2018 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

X11.tmpl nx-X11/config/cf/X11.tmpl +1 -1

xorg.cf nx-X11/config/cf/xorg.cf +1 -1

os.h nx-X11/programs/Xserver/include/os.h +6 -0

No files found.
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -633,7 +633,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
 	XvMCExtensionDefines \
 	GlxDefines \
 	SiteExtensionDefines \
-        XResExtensionDefines
+	XResExtensionDefines
 #endif
 #define ExtensionDefines BaseExtensionDefines ExtensionOSDefines
 #endif /* ExtensionDefines */

--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -594,7 +594,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef XFree86ServerOSDefines
 # define XFree86ServerOSDefines	-DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \
-				-DDDXOSVERRORF
+				-DDDXOSVERRORF -DCLIENTIDS
 #endif
 #ifndef XFree86ConsoleDefines

--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -557,4 +557,10 @@ extern int snprintf(char *str, size_t size, const char *format, ...)
 extern int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #endif
+#ifdef DEBUG
+#define DebugF ErrorF
+#else
+#define DebugF(...)             /* */
+#endif
 #endif /* OS_H */