os: split off internal definitions from client.h

The client.h file is part of the public module API, but it also contains
definitions that aren't useful for being used in modules. Splitting them
out into their own client_priv.h file, which isn't part of the API.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

2 files changed, 6 insertions, 14 deletions

diff --git a/include/client.h b/include/client.h
index 87f2b1172..8ecd41704 100644
--- a/include/client.h
+++ b/include/client.h
@@ -29,22 +29,12 @@
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif                          /* HAVE_DIX_CONFIG_H */
-#include <X11/Xfuncproto.h>
-#include <sys/types.h>
 
-/* Client IDs. Use GetClientPid, GetClientCmdName and GetClientCmdArgs
- * instead of accessing the fields directly. */
-typedef struct {
-    pid_t pid;                  /* process ID, -1 if not available */
-    const char *cmdname;        /* process name, NULL if not available */
-    const char *cmdargs;        /* process arguments, NULL if not available */
-} ClientIdRec, *ClientIdPtr;
+#include <sys/types.h>
+#include <X11/Xfuncproto.h>
 
 struct _Client;
-
-/* Initialize and clean up. */
-void ReserveClientIds(struct _Client *client);
-void ReleaseClientIds(struct _Client *client);
+typedef struct _ClientId *ClientIdPtr;
 
 /* Determine client IDs for caching. Exported on purpose for
  * extensions such as SELinux. */
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 3607ea88a..66f6081b0 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -73,6 +73,8 @@ typedef struct _saveSet {
 #define SaveSetAssignToRoot(ss,tr)  ((ss).toRoot = (tr))
 #define SaveSetAssignMap(ss,m)      ((ss).map = (m))
 
+struct _ClientId;
+
 typedef struct _Client {
     void *requestBuffer;
     void *osPrivate;             /* for OS layer, including scheduler */
@@ -109,7 +111,7 @@ typedef struct _Client {
     int smart_stop_tick;
 
     DeviceIntPtr clientPtr;
-    ClientIdPtr clientIds;
+    struct _ClientId *clientIds;
     int req_fds;
 } ClientRec;