diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
commit | b66699555d2e2503926f01a9c192481e01812399 (patch) | |
tree | fa7f275b0bc74c3ed8e85538602ed8b6a8a0f4c2 /nx-X11/programs/Xserver/hw/nxagent/Client.h | |
parent | 3523d15e2a9f84e2136e3370129a9bea0e16e072 (diff) | |
parent | 97a69b95ac3018f9a8838b09df28a0f33c484a0d (diff) | |
download | nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.gz nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.bz2 nx-libs-b66699555d2e2503926f01a9c192481e01812399.zip |
Merge branch 'uli42-pr/various6' into 3.6.x
Attributes GH PR #979: https://github.com/ArcticaProject/nx-libs/pull/979
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Client.h')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Client.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.h b/nx-X11/programs/Xserver/hw/nxagent/Client.h index ac2f34e8b..574466602 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Client.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Client.h @@ -44,10 +44,15 @@ enum ClientHint JAVA_WINDOW }; +/* client byte counting is currently unused */ +#undef COUNT_CLIENT_BYTES + typedef struct _PrivClientRec { int clientState; +#ifdef COUNT_CLIENT_BYTES long clientBytes; +#endif enum ClientHint clientHint; char *clientInfoString; } PrivClientRec; @@ -59,8 +64,6 @@ extern int nxagentClientPrivateIndex; extern void nxagentClientStateCallback(CallbackListPtr *callbacks, void *data, void *args); -#undef COUNT_CLIENT_BYTES - #ifdef COUNT_CLIENT_BYTES #define nxagentClientAddBytes(pClient, size) \ (nxagentClientPriv(pClient) -> clientBytes += (size)) |