diff options
| author | Max Horn | 2003-12-18 20:20:01 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-18 20:20:01 +0000 |
| commit | d8fb44ffc561657047c899617e68215cc1ea72b1 (patch) | |
| tree | adc40f179aba1de108f786c3596966510d6aafdf /backends | |
| parent | ee2c8b2ddb9bb444b67643017928e32c8bbe3411 (diff) | |
| download | scummvm-rg350-d8fb44ffc561657047c899617e68215cc1ea72b1.tar.gz scummvm-rg350-d8fb44ffc561657047c899617e68215cc1ea72b1.tar.bz2 scummvm-rg350-d8fb44ffc561657047c899617e68215cc1ea72b1.zip | |
Patch #862283 (Help X11 backend to compile on FreeBSD)
svn-id: r11749
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/x11/x11.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp index 1199ce401a..f1145be931 100644 --- a/backends/x11/x11.cpp +++ b/backends/x11/x11.cpp @@ -38,7 +38,11 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/XShm.h> +#ifdef __linux__ #include <linux/soundcard.h> +#else +#include <sys/soundcard.h> +#endif #include <sched.h> #include <pthread.h> @@ -1023,8 +1027,8 @@ bool OSystem_X11::poll_event(Event *scumm_event) void OSystem_X11::set_timer(TimerProc callback, int interval) { if (callback != NULL) { - _timer_duration = timer; - _timer_next_expiry = get_msecs() + timer; + _timer_duration = interval; + _timer_next_expiry = get_msecs() + interval; _timer_callback = callback; _timer_active = true; } else { |