diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-26 13:55:07 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-26 13:55:07 +1030 |
| commit | 0ac175597712edfeae676f536746a4d26d625e30 (patch) | |
| tree | bd34a9601dc6f1a446646e0907e49c90c6862cc0 /hw/xfree86/dixmods/extmod | |
| parent | 210eeef495770c1883c842ff003c28ce25f279d4 (diff) | |
| parent | e915a2639752bc0ea9e6e192e020cc2031c08063 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xext/sampleEVI.c
Diffstat (limited to 'hw/xfree86/dixmods/extmod')
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.c | 9 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.h | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index acd700694..d0d892aaf 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -38,6 +38,15 @@ static MODULESETUPPROTO(extmodSetup); * Array describing extensions to be initialized */ static ExtensionModule extensionModules[] = { +#ifdef XSELINUX + { + SELinuxExtensionInit, + SELINUX_EXTENSION_NAME, + NULL, + NULL, + NULL + }, +#endif #ifdef SHAPE { ShapeExtensionInit, diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 99d714c4f..3c2e2022a 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -125,12 +125,9 @@ extern void ShmRegisterFuncs( ShmFuncsPtr funcs); #endif -#ifdef XACE -extern void XaceExtensionInit(INITARGS); -#endif - #ifdef XSELINUX extern void SELinuxExtensionInit(INITARGS); +#include "xselinux.h" #endif #if 1 |