diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-10-22 14:39:10 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-10-22 14:39:10 +0200 |
| commit | 3dc4595560b34242fe4705af8c93d0024eeb2c56 (patch) | |
| tree | 026ed0c86a76dd3835c83ca914ebae671b699ae4 | |
| parent | 7392dd6a9b550538a5b7f2aa5204c805c15a9d6a (diff) | |
| parent | 71abe0bebc85e839bf8cd67ad1d6f9cf0a9a5a96 (diff) | |
| download | nx-libs-3dc4595560b34242fe4705af8c93d0024eeb2c56.tar.gz nx-libs-3dc4595560b34242fe4705af8c93d0024eeb2c56.tar.bz2 nx-libs-3dc4595560b34242fe4705af8c93d0024eeb2c56.zip | |
Merge branch 'uli42-pr/enableclientids' into 3.6.x
Attributes GH PR #730: https://github.com/ArcticaProject/nx-libs/pull/730
| -rw-r--r-- | nx-X11/config/cf/X11.tmpl | 2 | ||||
| -rw-r--r-- | nx-X11/config/cf/xorg.cf | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/include/os.h | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index b7f9a6029..a5349e0eb 100644 --- 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 */ 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 */ |