diff options
author | Mihai Moldovan <ionic@ionic.de> | 2018-02-28 01:03:53 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-28 01:03:53 +0100 |
commit | 5c4777b2d3d3d06ee8af6bfd78289373e340ad52 (patch) | |
tree | 89015a452f1fa8488b0db6dda72244f1478d7874 /nx-X11/programs/Xserver/os | |
parent | 1918bcb9c01fcf45727b514afb8ca8d978a2bf93 (diff) | |
parent | 809206d0cf79f367d852f180f1a5733420010689 (diff) | |
download | nx-libs-5c4777b2d3d3d06ee8af6bfd78289373e340ad52.tar.gz nx-libs-5c4777b2d3d3d06ee8af6bfd78289373e340ad52.tar.bz2 nx-libs-5c4777b2d3d3d06ee8af6bfd78289373e340ad52.zip |
Merge branch 'uli42-pr/fix_autodpi_in_usage' into 3.6.x
Attributes GH PR #667: https://github.com/ArcticaProject/nx-libs/pull/667
Diffstat (limited to 'nx-X11/programs/Xserver/os')
-rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 2edd8dd3f..0a1e3f7b2 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -269,7 +269,9 @@ long Memory_fail = 0; #include <stdlib.h> /* for random() */ #endif +#ifndef NXAGENT_SERVER char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ +#endif extern char dispatchExceptionAtReset; @@ -628,7 +630,9 @@ void UseMsg(void) ErrorF("-terminate terminate at server reset\n"); ErrorF("-to # connection time out\n"); ErrorF("-tst disable testing extensions\n"); +#ifndef NXAGENT_SERVER ErrorF("ttyxx server started from init on /dev/ttyxx\n"); +#endif ErrorF("v video blanking for screen-saver\n"); ErrorF("-v screen-saver without video blanking\n"); ErrorF("-wm WhenMapped default backing-store\n"); @@ -1036,11 +1040,13 @@ ProcessCommandLine(int argc, char *argv[]) /* ignore all remaining arguments */ break; } +#ifndef NXAGENT_SERVER else if (strncmp (argv[i], "tty", 3) == 0) { /* just in case any body is interested */ dev_tty_from_init = argv[i]; } +#endif #ifdef XDMCP else if ((skip = XdmcpOptions(argc, argv, i)) != i) { |