andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'jeremyhu/master'

Browse Source
This commit is contained in:
Keith Packard 2011-12-20 00:23:33 -08:00
commit 2d34b34ed7
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -2020,12 +2020,10 @@ if test "$KDRIVE" = yes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
fi
PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
if test "x$XEPHYR" = xauto; then
XEPHYR=$xephyr
fi
if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then
AC_MSG_ERROR([Xephyr dependencies missing])
PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [XEPHYR="yes"], [XEPHYR="no"])
elif test "x$XEPHYR" = xyes ; then
PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS)
fi
# Xephyr needs nanosleep() which is in librt on Solaris

6
hw/kdrive/linux/keyboard.c
View File

@ -692,7 +692,7 @@ LinuxKeyboardEnable (KdKeyboardInfo *ki)
return !Success;
fd = LinuxConsoleFd;
ki->driverPrivate = (void *) fd;
ki->driverPrivate = (void *) (intptr_t) fd;
ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
tcgetattr (fd, &LinuxTermios);
@ -724,7 +724,7 @@ LinuxKeyboardDisable (KdKeyboardInfo *ki)
if (!ki)
return;
fd = (int) ki->driverPrivate;
fd = (int) (intptr_t) ki->driverPrivate;
KdUnregisterFd(ki, fd, FALSE);
ioctl(fd, KDSKBMODE, LinuxKbdTrans);
@ -753,7 +753,7 @@ LinuxKeyboardLeds (KdKeyboardInfo *ki, int leds)
if (!ki)
return;
ioctl ((int)ki->driverPrivate, KDSETLED, leds & 7);
ioctl ((int)(intptr_t)ki->driverPrivate, KDSETLED, leds & 7);
}
KdKeyboardDriver LinuxKeyboardDriver = {

4
hw/kdrive/linux/ms.c
View File

@ -152,7 +152,7 @@ MsEnable (KdPointerInfo *pi)
}
if (KdRegisterFd (port, MsRead, pi))
return TRUE;
pi->driverPrivate = (void *)port;
pi->driverPrivate = (void *)(intptr_t)port;
return Success;
@ -164,7 +164,7 @@ MsEnable (KdPointerInfo *pi)
static void
MsDisable (KdPointerInfo *pi)
{
KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE);
KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
}
static void

4
hw/kdrive/linux/ps2.c
View File

@ -159,7 +159,7 @@ Ps2Enable (KdPointerInfo *pi)
return BadAlloc;
}
pi->driverPrivate = (void *)fd;
pi->driverPrivate = (void *)(intptr_t)fd;
return Success;
}
@ -168,7 +168,7 @@ Ps2Enable (KdPointerInfo *pi)
static void
Ps2Disable (KdPointerInfo *pi)
{
KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE);
KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
}
static void

7
hw/xquartz/mach-startup/Makefile.am
View File

@ -12,6 +12,13 @@ x11app_PROGRAMS = X11.bin
dist_X11_bin_SOURCES = \
bundle-main.c
# strndup(3) was added in Mac OS X 10.7, but we do this unconditionally to deal
# with the case where we build on Lion but target Snow Leopard as the minimum
# OS version.
#if NEED_STRNDUP
dist_X11_bin_SOURCES += $(top_srcdir)/os/strndup.c
#endif
nodist_X11_bin_SOURCES = \
mach_startupServer.c \
mach_startupUser.c