From fb7938315bed9d4cb5641ee9acebf78a13bc109e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun, 27 Sep 2009 09:48:43 -0700
Subject: [PATCH] Xi: Make CopyKeyClass X_HIDDEN to avoid ugly ifdef-fu (cherry
 picked from commit 6d436e17a9ae7f4ce8537f3fabc052d4f07ca75f)

---
 Xi/exevents.c | 3 ---
 include/dix.h | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 5e73bf3c2..cb2452bb8 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -192,9 +192,6 @@ XIGetDevice(xEvent* xE)
  * This code is basically the old SwitchCoreKeyboard.
  */
 
-#ifndef XQUARTZ
-static
-#endif
 void
 CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
 {
diff --git a/include/dix.h b/include/dix.h
index 49dfe3774..b1edb6c46 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -592,6 +592,7 @@ extern Bool IsKeyboardDevice(DeviceIntPtr dev);
 extern Bool IsPointerEvent(InternalEvent *event);
 extern Bool IsMaster(DeviceIntPtr dev);
 
+extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
 extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
 extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);