xserver: Branch 'master'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Thu Nov 22 18:02:15 PST 2007
hw/darwin/Makefile.am | 2 +-
hw/darwin/darwinEvents.c | 3 +--
hw/darwin/darwinKeyboard.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 63351df0eec320aa3ce27d4d2ee6bcdb58aa2d92
Author: Jeremy Huddleston <jeremy at tifa.local>
Date: Thu Nov 22 18:02:07 2007 -0800
Darwin: Fix compilation/linking problems
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index cd3f7f4..62cbecf 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -48,7 +48,7 @@ Xquartz_LDADD = \
$(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
$(top_builddir)/miext/rootless/accel/librlAccel.la \
- $(DARWIN_LIBS) $(XSERVER_LIBS) -lXplugin
+ $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
Xquartz_LDFLAGS = \
-XCClinker -Objc \
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index 06c4cc7..629fb2c 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -154,8 +154,7 @@ static void DarwinUpdateModifiers(
* are held down during a "context" switch -- otherwise, we would miss the KeyUp.
*/
static void DarwinReleaseModifiers(void) {
- xEvent e;
- DarwinUpdateModifiers(&e, KeyRelease, COMMAND_MASK(-1) | CONTROL_MASK(-1) | ALTERNATE_MASK(-1) | SHIFT_MASK(-1));
+ DarwinUpdateModifiers(KeyRelease, COMMAND_MASK(-1) | CONTROL_MASK(-1) | ALTERNATE_MASK(-1) | SHIFT_MASK(-1));
}
/*
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index efa12b7..47acb65 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -1070,7 +1070,7 @@ int DarwinModifierStringToNXKey(const char *str)
* This allows the ddx layer to prevent some keys from being remapped
* as modifier keys.
*/
-Bool LegalModifier(unsigned int key, DevicePtr pDev)
+Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
{
return 1;
}
More information about the xorg-commit
mailing list