summaryrefslogtreecommitdiff
path: root/xkb
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-07-10 02:02:56 +0100
committerKeith Packard <keithp@keithp.com>2012-07-09 23:06:41 -0700
commita1d41e311c21eb6627caa0d168e070ceaf90806f (patch)
treeb0df47d2426c60005c136859c0a3fe8abef73dd7 /xkb
parentb86aa74cafddf9bca5addfeb458a23f46ddcf132 (diff)
Move extension initialisation prototypes into extinit.h
Create extinit.h (and xf86Extensions.h, for Xorg-specific extensions) to hold all our extension initialisation prototypes, rather than duplicating them everywhere. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'xkb')
-rw-r--r--xkb/xkb.c1
-rw-r--r--xkb/xkb.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/xkb/xkb.c b/xkb/xkb.c
index ad837c87d..4440a98c1 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -36,6 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XKBSRV_NEED_FILE_FUNCS
#include <xkbsrv.h>
#include "extnsionst.h"
+#include "extinit.h"
#include "xace.h"
#include "xkb.h"
#include "protocol-versions.h"
diff --git a/xkb/xkb.h b/xkb/xkb.h
index a526356a9..f3a60af6b 100644
--- a/xkb/xkb.h
+++ b/xkb/xkb.h
@@ -27,6 +27,4 @@ extern int ProcXkbGetKbdByName(ClientPtr client);
extern int ProcXkbGetDeviceInfo(ClientPtr client);
extern int ProcXkbSetDeviceInfo(ClientPtr client);
extern int ProcXkbSetDebuggingFlags(ClientPtr client);
-
-extern void XkbExtensionInit(void);
#endif