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

1 files changed, 16 insertions, 6 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
index cbbb7bd1d..f770c7e66 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
@@ -51,23 +51,33 @@ void nxagentInitAtoms();
 
 int nxagentQueryAtoms(ScreenPtr pScreen);
 
+void nxagentResetAtomMap(void);
+
+void nxagentWMDetect(void);
+
+#ifdef XlibAtom
+
+/*
+ * only provide these protoypes if the including file knows about Xlib
+ * types. This allows us including Atoms.h without having to use the
+ * Xlib type magic of Agent.h
+ */
+
 /*
  * Create the atoms on the remote X server
  * and cache the couple local-remote atoms.
  */
 
-Atom nxagentMakeAtom(char *, unsigned, Bool);
+XlibAtom nxagentMakeAtom(char *, unsigned, Bool);
 
 /*
  * Converts local atoms in remote atoms and
  * viceversa.
  */
 
-Atom nxagentRemoteToLocalAtom(Atom);
-Atom nxagentLocalToRemoteAtom(Atom);
+Atom nxagentRemoteToLocalAtom(XlibAtom);
+XlibAtom nxagentLocalToRemoteAtom(Atom);
 
-void nxagentResetAtomMap(void);
-
-void nxagentWMDetect(void);
+#endif
 
 #endif /* __Atoms_H__ */