|
@@ -23,6 +23,7 @@ posix/thread.c: In function ‘vlc_clock_setup_once’:
|
|
|
posix/thread.c:88:18: error: lvalue required as left operand of assignment
|
|
|
vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC;
|
|
|
|
|
|
+[Bernd: rebased for 3.0.19]
|
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
|
---
|
|
|
src/posix/thread.c | 96 +++++++-----------------------------------------------
|
|
@@ -93,7 +94,7 @@ index dab8b71f97..8878941913 100644
|
|
|
-# warning Monotonic clock not available. Expect timing issues.
|
|
|
-#endif /* _POSIX_TIMERS */
|
|
|
-
|
|
|
- static struct timespec mtime_to_ts (mtime_t date)
|
|
|
+ static struct timespec mtime_to_ts (vlc_tick_t date)
|
|
|
{
|
|
|
lldiv_t d = lldiv (date, CLOCK_FREQ);
|
|
|
@@ -233,14 +187,11 @@ void vlc_cond_init (vlc_cond_t *p_condvar)
|
|
@@ -117,7 +118,7 @@ index dab8b71f97..8878941913 100644
|
|
|
|
|
|
@@ -625,44 +576,27 @@ void vlc_control_cancel (int cmd, ...)
|
|
|
|
|
|
- mtime_t mdate (void)
|
|
|
+ vlc_tick_t mdate (void)
|
|
|
{
|
|
|
-#if (_POSIX_TIMERS > 0)
|
|
|
struct timespec ts;
|
|
@@ -140,7 +141,7 @@ index dab8b71f97..8878941913 100644
|
|
|
}
|
|
|
|
|
|
#undef mwait
|
|
|
- void mwait (mtime_t deadline)
|
|
|
+ void mwait (vlc_tick_t deadline)
|
|
|
{
|
|
|
-#if (_POSIX_CLOCK_SELECTION > 0)
|
|
|
- vlc_clock_setup ();
|
|
@@ -165,7 +166,7 @@ index dab8b71f97..8878941913 100644
|
|
|
}
|
|
|
|
|
|
#undef msleep
|
|
|
-@@ -670,15 +604,7 @@ void msleep (mtime_t delay)
|
|
|
+@@ -670,15 +604,7 @@ void msleep (vlc_tick_t delay)
|
|
|
{
|
|
|
struct timespec ts = mtime_to_ts (delay);
|
|
|
|