31 lines
965 B
Diff
31 lines
965 B
Diff
From cc29e0dc978c1aea7b989c69a6512a80e2acf071 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
|
|
Date: Fri, 13 Sep 2013 15:16:31 -0700
|
|
Subject: [PATCH 28/39] os: Also define ListenOnOpenFD and AddClientOnOpenFD
|
|
unconditionally
|
|
|
|
Remove the #ifdef from the header file as well.
|
|
---
|
|
include/os.h | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/include/os.h b/include/os.h
|
|
index 4d4a0d6..4752d15 100644
|
|
--- a/include/os.h
|
|
+++ b/include/os.h
|
|
@@ -164,10 +164,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);
|
|
extern _X_EXPORT CARD64 GetTimeInMicros(void);
|
|
--
|
|
1.8.3.1
|
|
|