diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-12-28 21:02:14 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 22:52:53 +0100 |
| commit | 427b7b9777727df4115e3e9e6e63d5176fb0b495 (patch) | |
| tree | 1d319a61f55dd6132c17b5e7cb45b4585c3b6160 /nx-X11/programs/Xserver/hw/nxagent/Rootless.h | |
| parent | a261b72435d7d30dbe36529a51fc53f6ade34dff (diff) | |
| download | nx-libs-427b7b9777727df4115e3e9e6e63d5176fb0b495.tar.gz nx-libs-427b7b9777727df4115e3e9e6e63d5176fb0b495.tar.bz2 nx-libs-427b7b9777727df4115e3e9e6e63d5176fb0b495.zip | |
nxagent: Use XlibAtom data type where appropriate
XlibAtom should be used wherever remote atoms are handled. This is
important as Xlib data types and server data types of the same name do
not always have identical sizes.
See also https://lists.freedesktop.org/archives/xorg-devel/2015-August/047245.html
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Rootless.h')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Rootless.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.h b/nx-X11/programs/Xserver/hw/nxagent/Rootless.h index 062e164f4..76e40b055 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.h @@ -46,13 +46,15 @@ extern WindowPtr nxagentRootlessWindow; * connected to the real X server. */ +#ifdef XlibAtom typedef struct { Window window; - Atom property; + XlibAtom property; } PropertyRequestRec; extern PropertyRequestRec nxagentPropertyRequests[256]; +#endif Window nxagentRootlessWindowParent(WindowPtr pWin); @@ -75,14 +77,18 @@ int nxagentExportProperty(WindowPtr pWin, Atom property, Atom type, int format, #define MAX_RETRIEVED_PROPERTY_SIZE 256 * 1024 -void nxagentImportProperty(Window window, Atom property, Atom type, int format, +#ifdef XlibAtom +void nxagentImportProperty(Window window, XlibAtom property, XlibAtom type, int format, unsigned long nitems, unsigned long bytes_after, unsigned char *buffer); +#endif /* * Push last ChangeProperty to the list. */ -void nxagentAddPropertyToList(Atom property, WindowPtr pWin); +#ifdef XlibAtom +void nxagentAddPropertyToList(XlibAtom property, WindowPtr pWin); +#endif /* * Check if a PropertyNotify match the top |