aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-10-21 23:54:10 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-10-22 14:38:20 +0200
commit71abe0bebc85e839bf8cd67ad1d6f9cf0a9a5a96 (patch)
tree026ed0c86a76dd3835c83ca914ebae671b699ae4
parent97f768a26f19a730155fc73efdfe737cefee3462 (diff)
downloadnx-libs-71abe0bebc85e839bf8cd67ad1d6f9cf0a9a5a96.tar.gz
nx-libs-71abe0bebc85e839bf8cd67ad1d6f9cf0a9a5a96.tar.bz2
nx-libs-71abe0bebc85e839bf8cd67ad1d6f9cf0a9a5a96.zip
enable CLIENTIDS functions in xserver
these can be used to determine the PID and name of an X11 client, e.g. in debugging.
-rw-r--r--nx-X11/config/cf/xorg.cf2
-rw-r--r--nx-X11/programs/Xserver/include/os.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 578d82af4..6f1f43018 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 be41e0118..920b474db 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 */