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