diff options
Diffstat (limited to 'nx-X11/programs/Xserver/dix/dispatch.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dispatch.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index f80cec0dd..3ab9b2472 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -213,16 +213,18 @@ UpdateCurrentTimeIf() currentTime = systime; } -#ifndef NXAGENT_SERVER void -InitSelections() +#ifdef NXAGENT_SERVER +xorg_InitSelections(void) +#else +InitSelections(void) +#endif { if (CurrentSelections) free(CurrentSelections); CurrentSelections = (Selection *)NULL; NumCurrentSelections = 0; } -#endif /* NXAGENT_SERVER */ #undef SMART_DEBUG @@ -3478,11 +3480,14 @@ InitProcVectors(void) * then killed again, the client is really destroyed. *********************/ -#ifndef NXAGENT_SERVER char dispatchExceptionAtReset = DE_RESET; void -CloseDownClient(register ClientPtr client) +#ifdef NXAGENT_SERVER +xorg_CloseDownClient(ClientPtr client) +#else +CloseDownClient(ClientPtr client) +#endif { Bool really_close_down = client->clientGone || client->closeDownMode == DestroyAll; @@ -3567,7 +3572,6 @@ CloseDownClient(register ClientPtr client) currentMaxClients--; } } -#endif /* NXAGENT_SERVER */ static void KillAllClients() @@ -3644,9 +3648,12 @@ void InitClient(ClientPtr client, int i, void * ospriv) client->clientIds = NULL; } -#ifndef NXAGENT_SERVER int +#ifdef NXAGENT_SERVER +xorg_InitClientPrivates(ClientPtr client) +#else InitClientPrivates(ClientPtr client) +#endif { register char *ptr; DevUnion *ppriv; @@ -3690,7 +3697,6 @@ InitClientPrivates(ClientPtr client) } return 1; } -#endif /* NXAGENT_SERVER */ /************************ * int NextAvailableClient(ospriv) |