frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Darwin: Fix compilation/linking problems

This commit is contained in:
Jeremy Huddleston 2007-11-22 18:02:07 -08:00
parent bf4ef4da75
commit 63351df0ee
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/darwin/Makefile.am
View File

@ -48,7 +48,7 @@ Xquartz_LDADD = \
$(top_builddir)/miext/rootless/librootless.la \ $(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \ $(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
$(top_builddir)/miext/rootless/accel/librlAccel.la \ $(top_builddir)/miext/rootless/accel/librlAccel.la \
$(DARWIN_LIBS) $(XSERVER_LIBS) -lXplugin $(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
Xquartz_LDFLAGS = \ Xquartz_LDFLAGS = \
-XCClinker -Objc \ -XCClinker -Objc \

3
hw/darwin/darwinEvents.c
View File

@ -154,8 +154,7 @@ static void DarwinUpdateModifiers(
* are held down during a "context" switch -- otherwise, we would miss the KeyUp. * are held down during a "context" switch -- otherwise, we would miss the KeyUp.
*/ */
static void DarwinReleaseModifiers(void) { static void DarwinReleaseModifiers(void) {
xEvent e; DarwinUpdateModifiers(KeyRelease, COMMAND_MASK(-1) | CONTROL_MASK(-1) | ALTERNATE_MASK(-1) | SHIFT_MASK(-1));
DarwinUpdateModifiers(&e, KeyRelease, COMMAND_MASK(-1) | CONTROL_MASK(-1) | ALTERNATE_MASK(-1) | SHIFT_MASK(-1));
} }
/* /*

2
hw/darwin/darwinKeyboard.c
View File

@ -1070,7 +1070,7 @@ int DarwinModifierStringToNXKey(const char *str)
* This allows the ddx layer to prevent some keys from being remapped * This allows the ddx layer to prevent some keys from being remapped
* as modifier keys. * as modifier keys.
*/ */
Bool LegalModifier(unsigned int key, DevicePtr pDev) Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
{ {
return 1; return 1;
} }