summaryrefslogtreecommitdiff
path: root/include/dixstruct.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-11-07 15:18:28 -0800
committerKeith Packard <keithp@keithp.com>2013-11-11 15:32:07 -0800
commitfc84166e65c35ad75f566b135dcfc305ad5a2fde (patch)
treed7070f8ac19aaece98245af234b8df76246ea116 /include/dixstruct.h
parenta239e6faf3fce848ac0d10c48f8e817db68a493c (diff)
Get rid of the rest of the FD passing code when XTRANS_SEND_FDS isn't set
req_fds and SetReqFds in include/dixstruct.h ReadFdFromClient, WriteFdToClient and the FD flushing in os/io.c Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include/dixstruct.h')
-rw-r--r--include/dixstruct.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 456e63360..6f5667fcb 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -110,15 +110,19 @@ typedef struct _Client {
DeviceIntPtr clientPtr;
ClientIdPtr clientIds;
+#if XTRANS_SEND_FDS
int req_fds;
+#endif
} ClientRec;
+#if XTRANS_SEND_FDS
static inline void
SetReqFds(ClientPtr client, int req_fds) {
if (client->req_fds != 0 && req_fds != client->req_fds)
LogMessage(X_ERROR, "Mismatching number of request fds %d != %d\n", req_fds, client->req_fds);
client->req_fds = req_fds;
}
+#endif
/*
* Scheduling interface