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/hw/nxagent/NXproperty.c | |
| 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/hw/nxagent/NXproperty.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 94e9e4b2a..9799d80d5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -93,6 +93,14 @@ nxagentWMStateRec; #undef TEST #undef DEBUG +#ifdef NXAGENT_CLIPBOARD +extern WindowPtr nxagentGetClipboardWindow(Atom, WindowPtr); +#endif + +#ifdef NXAGENT_ARTSD +extern Atom mcop_local_atom; +#endif + int ProcChangeProperty(ClientPtr client) { @@ -127,11 +135,7 @@ ProcChangeProperty(ClientPtr client) REQUEST_FIXED_SIZE(xChangePropertyReq, totalSize); #ifdef NXAGENT_CLIPBOARD - { - extern WindowPtr nxagentGetClipboardWindow(Atom, WindowPtr); - - pWin = nxagentGetClipboardWindow(stuff->property, NULL); - } + pWin = nxagentGetClipboardWindow(stuff->property, NULL); if (pWin == NULL) #endif @@ -168,7 +172,6 @@ ProcChangeProperty(ClientPtr client) they are already set reflecting the server side settings. Just return success. */ - extern Atom mcop_local_atom; if (stuff->property == mcop_local_atom) return client->noClientException; } |