nxagent: half number of NameForAtom calls

nx-X11/programs/Xserver/hw/nxagent/Agent.h

@@ -133,6 +133,4 @@ typedef XID KeySym64;
 #undef KeySym
 #endif /*_XSERVER64_tmp*/
 
-#define validateString(string) ((string) ? (string) : "(null)")
-
 #endif /* __Agent_H__ */

nx-X11/programs/Xserver/hw/nxagent/Args.c

@@ -70,6 +70,7 @@ is" without express or implied warranty.
 #include "Handlers.h"
 #include "Error.h"
 #include "Reconnect.h"
+#include "Atoms.h"
 
 /*
  * NX includes and definitions.

nx-X11/programs/Xserver/hw/nxagent/Atoms.c

@@ -95,6 +95,10 @@ static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] =
 
 static XErrorHandler previousErrorHandler = NULL;
 
+const char * validateString(const char *str) {
+  return str ? str : "(null)";
+}
+
 static void catchAndRedirect(Display* dpy, XErrorEvent* X)
 {
   if (X -> error_code == BadAccess &&

nx-X11/programs/Xserver/hw/nxagent/Atoms.h

@@ -36,6 +36,8 @@ extern Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS];
 
 extern Bool nxagentWMIsRunning;
 
+extern const char * validateString(const char *);
+
 /*
  * Create the required atoms internally
  * to the agent server.

nx-X11/programs/Xserver/hw/nxagent/Client.c

@@ -51,6 +51,7 @@
 #include "Handlers.h"
 #include "Events.h"
 #include "Drawable.h"
+#include "Atoms.h"
 
 /*
  * Need to include this after the stub

nx-X11/programs/Xserver/hw/nxagent/Font.c

@@ -57,6 +57,7 @@ is" without express or implied warranty.
 #include "Reconnect.h"
 
 #include "Args.h"
+#include "Atoms.h"
 
 #include "compext/Compext.h"
 #include <nx/NXalert.h>