summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-07-10 02:03:09 +0100
committerKeith Packard <keithp@keithp.com>2012-07-09 23:28:37 -0700
commit6fb481d1251626456914d0012d6ca5a342bfdf71 (patch)
treeb9dbf24b20b0f94e7ddc3d6e989d27bad8d4cdad /include
parent5d92ee4081a23a6b4d1f9ba2a98985f539f99312 (diff)
Move SELinux from extmod to built-in
Instead of letting it languish in extmod just because we want to configure bits of it from xf86, move XSELinux to the builtin part of Xext, and do its configuration from xf86ExtensionInit. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include')
-rw-r--r--include/extinit.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/extinit.h b/include/extinit.h
index ea41eba14..0a24db068 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -158,7 +158,7 @@ extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev,
#include <X11/extensions/XKB.h>
extern void XkbExtensionInit(void);
-#if defined(XSELINUX) && !defined(XorgLoader)
+#if defined(XSELINUX)
#include "xselinux.h"
extern Bool noSELinuxExtension;
extern void SELinuxExtensionInit(void);