xserver: Branch 'xwayland'

[Kristian Høgsberg]

 include/os.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fd912d31c50783291916731cec61be74b6721b64
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Fri Sep 13 15:16:31 2013 -0700

    os: Also define ListenOnOpenFD and AddClientOnOpenFD unconditionally
    
    Remove the #ifdef from the header file as well.

diff --git a/include/os.h b/include/os.h
index 32e5b96..5d845b0 100644
--- a/include/os.h
+++ b/include/os.h
@@ -160,10 +160,9 @@ extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
 
 extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ );
 
-#if defined(XQUARTZ) || defined(XORG_WAYLAND)
 extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
+
 extern _X_EXPORT void AddClientOnOpenFD(int /* fd */ );
-#endif
 
 extern _X_EXPORT CARD32 GetTimeInMillis(void);