[PATCH 1/3] os: Always compile ListenOnOpenFD() and export it

[Daniel Stone]

Hi,
These three are:
Reviewed-by: Daniel Stone <daniel at fooishbar.org>

Cheers,
Daniel

On 19 March 2014 05:05, Kristian Høgsberg <krh at bitplanet.net> wrote:
> 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 at bitplanet.net>
> ---
>  include/os.h    | 4 +---
>  os/connection.c | 7 ++-----
>  2 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/include/os.h b/include/os.h
> index e5f86d6..90229e6 100644
> --- a/include/os.h
> +++ b/include/os.h
> @@ -166,9 +166,7 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
>
>  extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ );
>
> -#ifdef XQUARTZ
> -extern void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
> -#endif
> +extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
>
>  extern _X_EXPORT CARD32 GetTimeInMillis(void);
>  extern _X_EXPORT CARD64 GetTimeInMicros(void);
> diff --git a/os/connection.c b/os/connection.c
> index ddf4f0a..400c542 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
> --
> 1.9.0
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel