[Scummvm-cvs-logs] CVS: scummvm/backends/x11 x11.cpp,1.20,1.21

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/x11
In directory sc8-pr-cvs1:/tmp/cvs-serv30559

Modified Files:
	x11.cpp 
Log Message:
Patch #862283 (Help X11 backend to compile on FreeBSD)

Index: x11.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/x11/x11.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- x11.cpp	7 Nov 2003 02:48:53 -0000	1.20
+++ x11.cpp	18 Dec 2003 20:20:01 -0000	1.21
@@ -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 @@
 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 {