From 80f18a73267bd3090e459de609a7006a21e6c649 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 24 Aug 2009 09:21:03 +1000
Subject: [PATCH] input: move CorePointer/KeyboardProc declarations into
 header.

The extern declaration in xichangehierarchy.c was broken anyway.
This fixes a crash on creating a new master device.

Reported-by: Maxim Levitsky
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 Xi/xichangehierarchy.c | 4 ----
 dix/devices.c          | 3 ---
 include/dix.h          | 3 +++
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index 48d25c3aa..c123724b8 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -54,10 +54,6 @@
 
 #include "xichangehierarchy.h"
 
-extern DeviceProc CorePointerProc;
-extern DeviceProc CoreKeyboardProc;
-
-
 /**
  * Send the current state of the device hierarchy to all clients.
  */
diff --git a/dix/devices.c b/dix/devices.c
index e58e940b7..f73b5ffef 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -98,9 +98,6 @@ DevPrivateKey UnusedClassesPrivateKey = &UnusedClassesPrivateKeyIndex;
 static int XTstDevicePrivateKeyIndex;
 DevPrivateKey XTstDevicePrivateKey = &XTstDevicePrivateKeyIndex;
 
-
-int CorePointerProc(DeviceIntPtr, int);
-int CoreKeyboardProc(DeviceIntPtr, int);
 /**
  * vxtstpointer
  * is the virtual pointer for XTest. It is the first slave
diff --git a/include/dix.h b/include/dix.h
index c6e52e71d..e2db6b655 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -586,6 +586,9 @@ extern Bool IsKeyboardDevice(DeviceIntPtr dev);
 extern Bool IsPointerEvent(InternalEvent *event);
 extern Bool IsMaster(DeviceIntPtr dev);
 
+extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
+extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);
+
 
 /*
  * These are deprecated compatibility functions and will be removed soon!