annotate osdep/timer.h @ 10621:9f4af7d95d87

this small patch allows to compile the file libmpdemux/tvi_v4l.c properly, when the Linux is patched with the V4L2 patch, which automatically includes <linux/videodev2.h> when you include <linux/videodev.h>. It is necessary then to prevent <linux/time.h> from including (by defining the _LINUX_TIME_H macro) in order to resolve some collisions and it is also necessary to prevent the defining of "struct v4l2_capability" and "VIDIOC_QUERYCAP" in libmpdemux/tvi_v4l.c, when they are allready defined in the <linux/videodev2.h>. Patch by Martin Drab <drab@kepler.fjfi.cvut.cz>, checked by Arpi.
author diego
date Fri, 15 Aug 2003 15:25:55 +0000
parents edfe34c5405d
children f9755d9c479a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4863
df50da00260a POSIX compatible timer's callback
nick
parents: 4385
diff changeset
1 #ifndef __TIMER_H
df50da00260a POSIX compatible timer's callback
nick
parents: 4385
diff changeset
2 #define __TIMER_H
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 void InitTimer();
99
fb1fc94eaff0 removed redundancy...
arpi_esp
parents: 1
diff changeset
5 unsigned int GetTimer();
4385
7bb8f7905000 GetTimerMS added - get timer in millisec
arpi
parents: 2266
diff changeset
6 unsigned int GetTimerMS();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7 //int uGetTimer();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 float GetRelativeTime();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9
2266
c2ed1e5742ed sleep stuff moved to linux/timertimer-lx.c
arpi
parents: 99
diff changeset
10 int usec_sleep(int usec_delay);
c2ed1e5742ed sleep stuff moved to linux/timertimer-lx.c
arpi
parents: 99
diff changeset
11
4863
df50da00260a POSIX compatible timer's callback
nick
parents: 4385
diff changeset
12 /* timer's callback handling */
df50da00260a POSIX compatible timer's callback
nick
parents: 4385
diff changeset
13 typedef void timer_callback( void );
df50da00260a POSIX compatible timer's callback
nick
parents: 4385
diff changeset
14 extern unsigned set_timer_callback(unsigned ms,timer_callback func);
df50da00260a POSIX compatible timer's callback
nick
parents: 4385
diff changeset
15 extern void restore_timer(void);
df50da00260a POSIX compatible timer's callback
nick
parents: 4385
diff changeset
16
df50da00260a POSIX compatible timer's callback
nick
parents: 4385
diff changeset
17 #endif