diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2006-05-03 23:45:16 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2006-05-03 23:45:16 +0000 |
| commit | b46d6a44fa97a3e66de828385026b7f84d9e59b8 (patch) | |
| tree | 5ea4b3238c140c0ab4a5607d30a593e5ec801b5a /hw | |
| parent | fc91ca069dd55490b99b096f029e0864b049120c (diff) | |
Make Xephyr build on Solaris:
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since
they're not needed for Xephyr-only builds
Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kdrive/linux/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am index ddf1d4e4e..29959df00 100644 --- a/hw/kdrive/linux/Makefile.am +++ b/hw/kdrive/linux/Makefile.am @@ -16,14 +16,14 @@ endif if KDRIVE_HW KDRIVE_HW_SOURCES = \ + agp.c \ + agp.h \ evdev.c \ keyboard.c \ linux.c endif liblinux_a_SOURCES = \ - agp.c \ - agp.h \ bus.c \ klinux.h \ mouse.c \ diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 7f1c07f9a..1c77dd133 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -37,6 +37,9 @@ #include "kkeymap.h" #include <signal.h> #include <stdio.h> +#ifdef sun +#include <sys/file.h> /* needed for FNONBLOCK & FASYNC */ +#endif #ifdef XKB #include <X11/extensions/XKBsrv.h> |