summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-27 09:48:43 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-27 09:52:03 -0700
commitfb7938315bed9d4cb5641ee9acebf78a13bc109e (patch)
treea1b183fc15249141c99391e8a0a33256e54c5986
parenta2cd21177859eb45320a94c96dde7d9058ab7650 (diff)
Xi: Make CopyKeyClass X_HIDDEN to avoid ugly ifdef-fu
(cherry picked from commit 6d436e17a9ae7f4ce8537f3fabc052d4f07ca75f)
-rw-r--r--Xi/exevents.c3
-rw-r--r--include/dix.h1
2 files changed, 1 insertions, 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);