Darwin: Fix compilation/linking problems
This commit is contained in:
parent
bf4ef4da75
commit
63351df0ee
|
@ -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 \
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user