diff options
| author | Jeremy Huddleston <jeremy@tifa.local> | 2007-11-22 18:02:07 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremy@tifa.local> | 2007-11-22 18:02:07 -0800 |
| commit | 63351df0eec320aa3ce27d4d2ee6bcdb58aa2d92 (patch) | |
| tree | 4caa8bc0e2834e217fedd41ce311598c6120770e | |
| parent | bf4ef4da759c01e6794ed28ba4988a2c8ee049bf (diff) | |
Darwin: Fix compilation/linking problems
| -rw-r--r-- | hw/darwin/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/darwin/darwinEvents.c | 3 | ||||
| -rw-r--r-- | hw/darwin/darwinKeyboard.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am index cd3f7f47b..62cbecf1d 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 06c4cc7dd..629fb2c9d 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 efa12b7b7..47acb65c5 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; } |