diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:39:48 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:39:48 +0200 |
| commit | 3a3a3373c36b5af6208ee5fdfe25e64b5766b75a (patch) | |
| tree | 619edfb91b22fe9e604b115b6f88616e942709f9 /nx-X11/programs/Xserver/os/utils.c | |
| parent | 796c8e421fd9df658fd5b324fcaa5182566e6905 (diff) | |
| parent | 085f8a4f672ed3e167bdd7791835f7ab2bebb723 (diff) | |
| download | nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.tar.gz nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.tar.bz2 nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.zip | |
Merge branch 'uli42-pr/various2' into 3.6.x
Attributes GH PR #827: https://github.com/ArcticaProject/nx-libs/pull/827
Diffstat (limited to 'nx-X11/programs/Xserver/os/utils.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 4d81ff927..f9b06de2d 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -271,6 +271,14 @@ long Memory_fail = 0; char *dev_tty_from_init = NULL; /* since we need to parse it anyway */ #endif +#ifdef NXAGENT_SERVER +extern const char *nxagentProgName; +#endif + +#ifdef NX_TRANS_SOCKET +extern char **environ; +#endif + extern char dispatchExceptionAtReset; /* Extension enable/disable in miinitext.c */ @@ -554,7 +562,6 @@ AdjustWaitForDelay (void * waitTime, unsigned long newdelay) void UseMsg(void) { #ifdef NXAGENT_SERVER - extern const char *nxagentProgName; ErrorF("Usage: %s [<options>] [:<display>]\n\n", nxagentProgName); #else ErrorF("use: X [:<display>] [option]\n"); @@ -1731,8 +1738,6 @@ Popen(char *command, char *type) #else - extern char **environ; - char **ep = environ; ep = environ; |