diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 22:59:43 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-05 22:59:43 +0100 |
| commit | 04962efa95a41cd6f665ebb110a7ce07d99a4554 (patch) | |
| tree | 1d319a61f55dd6132c17b5e7cb45b4585c3b6160 /nx-X11/programs/Xserver/hw/nxagent/Rootless.h | |
| parent | a261b72435d7d30dbe36529a51fc53f6ade34dff (diff) | |
| parent | 427b7b9777727df4115e3e9e6e63d5176fb0b495 (diff) | |
| download | nx-libs-04962efa95a41cd6f665ebb110a7ce07d99a4554.tar.gz nx-libs-04962efa95a41cd6f665ebb110a7ce07d99a4554.tar.bz2 nx-libs-04962efa95a41cd6f665ebb110a7ce07d99a4554.zip | |
Merge branch 'uli42-pr/xlib_types' into 3.6.x
Attributes GH PR #883: https://github.com/ArcticaProject/nx-libs/pull/883
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 |