[X2Go-Commits] [nx-libs] 40/108: enable CLIENTIDS functions in xserver

git-admin at x2go.org git-admin at x2go.org
Fri Nov 9 20:35:39 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 71abe0bebc85e839bf8cd67ad1d6f9cf0a9a5a96
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Oct 21 23:54:10 2018 +0200

    enable CLIENTIDS functions in xserver
    
    these can be used to determine the PID and name of an X11 client,
    e.g. in debugging.
---
 nx-X11/config/cf/xorg.cf             | 2 +-
 nx-X11/programs/Xserver/include/os.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 578d82a..6f1f430 100644
--- 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
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index be41e01..920b474 100644
--- 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 */

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list