diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-17 22:37:22 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-10-17 22:37:22 +0200 |
| commit | 7a02b4aba77a64b38992f1a20d8c851bdcc11500 (patch) | |
| tree | 255cb8e504ca769ea0e8d8b26875692d99a46be8 /nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c | |
| parent | 2b0976e93809291eaff0725a5c0772e00a450e2b (diff) | |
| parent | ae037701fe9a6337375d51abb2ea5b7aafdb434e (diff) | |
| download | nx-libs-7a02b4aba77a64b38992f1a20d8c851bdcc11500.tar.gz nx-libs-7a02b4aba77a64b38992f1a20d8c851bdcc11500.tar.bz2 nx-libs-7a02b4aba77a64b38992f1a20d8c851bdcc11500.zip | |
Merge branch 'uli42-pr/fix_stack_smashing' into 3.6.x
Attributes GH PR #942: https://github.com/ArcticaProject/nx-libs/pull/942
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c index 230c9abae..3492ef473 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c +++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c @@ -23,6 +23,12 @@ /* */ /**************************************************************************/ +/* + * let the types be the Xlib types by undefining _XSERVER64. This + * means, when calling the functions of this file from nxagent (where + * Agent.h has been included) you need to use/provide XlibAtom and + * XlibWindow instead of Atom and Window + */ #undef _XSERVER64 #include <sys/socket.h> |