diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-03-18 22:05:58 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-03-20 09:23:09 +1000 |
| commit | 62d584d63190c6c8cef5fd49d87b1cb29358a434 (patch) | |
| tree | 9641ee652d3e4d372cc5e51e82f56d7563469a51 /os | |
| parent | 797781c7bfd7a0df354fb85aa73df4560828b90b (diff) | |
os: Always compile ListenOnOpenFD() and export it
This function was written to allow the X server to inherit the listen
socket from launchd on OS X. The code is not specific to OS X though
and will be useful for on-demand launched Xwayland servers.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'os')
| -rw-r--r-- | os/connection.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/os/connection.c b/os/connection.c index ddf4f0a3a..400c5425d 100644 --- a/os/connection.c +++ b/os/connection.c @@ -1253,8 +1253,7 @@ MakeClientGrabPervious(ClientPtr client) } } -#ifdef XQUARTZ -/* Add a fd (from launchd) to our listeners */ +/* Add a fd (from launchd or similar) to our listeners */ void ListenOnOpenFD(int fd, int noxauth) { @@ -1276,7 +1275,7 @@ ListenOnOpenFD(int fd, int noxauth) */ ciptr = _XSERVTransReopenCOTSServer(5, fd, port); if (ciptr == NULL) { - ErrorF("Got NULL while trying to Reopen launchd port.\n"); + ErrorF("Got NULL while trying to Reopen listen port.\n"); return; } @@ -1308,5 +1307,3 @@ ListenOnOpenFD(int fd, int noxauth) XdmcpReset(); #endif } - -#endif |