2013-12-17 15:17:41 +00:00
|
|
|
From 6e6f302a5bfa72b195021c0053aab3286d12f87a Mon Sep 17 00:00:00 2001
|
2013-09-23 18:10:24 +00:00
|
|
|
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
|
|
|
|
|
Date: Fri, 13 Sep 2013 14:53:16 -0700
|
2013-12-17 15:17:41 +00:00
|
|
|
Subject: [PATCH 25/38] os: Don't include xorg-server.h
|
2013-09-23 18:10:24 +00:00
|
|
|
|
|
|
|
|
Just always compile in ListenOnOpenFD and AddClientOnOpenFD, they
|
|
|
|
|
don't depend on anything from Quartz or Wayland.
|
|
|
|
|
---
|
|
|
|
|
os/connection.c | 4 ----
|
|
|
|
|
1 file changed, 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/os/connection.c b/os/connection.c
|
2013-11-06 20:45:57 +00:00
|
|
|
index a95e7da..0a858b7 100644
|
2013-09-23 18:10:24 +00:00
|
|
|
--- a/os/connection.c
|
|
|
|
|
+++ b/os/connection.c
|
|
|
|
|
@@ -64,7 +64,6 @@ SOFTWARE.
|
|
|
|
|
#include <dix-config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#include <xorg-server.h>
|
|
|
|
|
#ifdef WIN32
|
|
|
|
|
#include <X11/Xwinsock.h>
|
|
|
|
|
#endif
|
|
|
|
|
@@ -1259,7 +1258,6 @@ MakeClientGrabPervious(ClientPtr client)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#if defined(XQUARTZ) || defined(XORG_WAYLAND)
|
|
|
|
|
/* Add a fd (from launchd) to our listeners */
|
|
|
|
|
void
|
|
|
|
|
ListenOnOpenFD(int fd, int noxauth)
|
|
|
|
|
@@ -1334,5 +1332,3 @@ AddClientOnOpenFD(int fd)
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
-#endif
|
|
|
|
|
--
|
2013-12-17 15:17:41 +00:00
|
|
|
1.8.4.2
|
2013-09-23 18:10:24 +00:00
|
|
|
|
