diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2021-11-11 09:03:17 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2021-11-11 09:03:17 +0000 |
| commit | 79250ad1e2b76f2ba5aa8d6dc0134c6c07ceac3a (patch) | |
| tree | 6d31264b9d5ca7fc0d7c690ef6a3340917c949e4 /xserver/os/WaitFor.c | |
| parent | 0c0a487400d29e7404b66758c41ad54ee01d46ee (diff) | |
Update to xserver 21.1.0
Diffstat (limited to 'xserver/os/WaitFor.c')
| -rw-r--r-- | xserver/os/WaitFor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xserver/os/WaitFor.c b/xserver/os/WaitFor.c index dc33c1648..ff1d376e9 100644 --- a/xserver/os/WaitFor.c +++ b/xserver/os/WaitFor.c @@ -296,7 +296,7 @@ OsTimerPtr TimerSet(OsTimerPtr timer, int flags, CARD32 millis, OsTimerCallback func, void *arg) { - OsTimerPtr existing, tmp; + OsTimerPtr existing; CARD32 now = GetTimeInMillis(); if (!timer) { @@ -329,11 +329,11 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, input_lock(); /* Sort into list */ - xorg_list_for_each_entry_safe(existing, tmp, &timers, list) + xorg_list_for_each_entry(existing, &timers, list) if ((int) (existing->expires - millis) > 0) break; /* This even works at the end of the list -- existing->list will be timers */ - xorg_list_add(&timer->list, existing->list.prev); + xorg_list_append(&timer->list, &existing->list); /* Check to see if the timer is ready to run now */ if ((int) (millis - now) <= 0) |