nxagent: move validateString as inline func to Utils.h

7 files changed, 8 insertions, 9 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index b4cfdc99a..a6c21503a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -70,7 +70,7 @@ is" without express or implied warranty.
 #include "Handlers.h"
 #include "Error.h"
 #include "Reconnect.h"
-#include "Atoms.h"
+#include "Utils.h"
 
 /*
  * NX includes and definitions.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
index a0b90febd..0784d6c2c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.c
@@ -95,10 +95,6 @@ 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 &&
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
index ceeeb88f3..391e06181 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Atoms.h
@@ -36,8 +36,6 @@ 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.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Client.c b/nx-X11/programs/Xserver/hw/nxagent/Client.c
index fbacbb25d..38d877ed7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Client.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Client.c
@@ -51,7 +51,7 @@
 #include "Handlers.h"
 #include "Events.h"
 #include "Drawable.h"
-#include "Atoms.h"
+#include "Utils.h"
 
 /*
  * Need to include this after the stub
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index d586c016b..e1f12e733 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -57,7 +57,7 @@ is" without express or implied warranty.
 #include "Reconnect.h"
 
 #include "Args.h"
-#include "Atoms.h"
+#include "Utils.h"
 
 #include "compext/Compext.h"
 #include <nx/NXalert.h>
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
index eabf719c4..68c6890d8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c
@@ -38,6 +38,7 @@
 #include "Pixmaps.h"
 #include "Atoms.h"
 #include "Trap.h"
+#include "Utils.h"
 
 #include "compext/Compext.h"
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Utils.h b/nx-X11/programs/Xserver/hw/nxagent/Utils.h
index a3cbc2e9f..8a3335424 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Utils.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Utils.h
@@ -48,4 +48,8 @@
 #define MAX(A, B) ( (A) > (B) ? (A) : (B) );
 #endif
 
+static inline const char * validateString(const char *str) {
+  return str ? str : "(null)";
+}
+
 #endif /* __Utils_H__ */