diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-08-01 23:18:03 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:10:05 +0200 |
| commit | b1850beb9f58f32cb13f585b55a44a4467f2093a (patch) | |
| tree | 6978f1e17389167ad21fbc2a7405288979afa088 /nx-X11/programs/Xserver/os | |
| parent | 7d2a222f2c6b87c7277b50ed89e522b39a495975 (diff) | |
| download | nx-libs-b1850beb9f58f32cb13f585b55a44a4467f2093a.tar.gz nx-libs-b1850beb9f58f32cb13f585b55a44a4467f2093a.tar.bz2 nx-libs-b1850beb9f58f32cb13f585b55a44a4467f2093a.zip | |
nxagent: avoid nested externs
Diffstat (limited to 'nx-X11/programs/Xserver/os')
| -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; |