diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-11-27 09:19:21 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-11-27 09:19:21 +0100 |
| commit | 39a4f047c89ceb111c1756596c712a57048154e3 (patch) | |
| tree | 9c237408c22b7635903884af2456f9eec5cdcc4a /openbsc/include/openbsc/timer.h | |
| parent | 260b7ddb239d0d497ee7bb7c8c93d52a1c0fe88c (diff) | |
| parent | 1a79d364401dfad2a71f1e61ff13a3861e3da46e (diff) | |
Merge remote branch 'origin/master' into the lcr_rtp brancheversberg/lcr_rtp
Conflicts:
openbsc/src/Makefile.am
Diffstat (limited to 'openbsc/include/openbsc/timer.h')
| -rw-r--r-- | openbsc/include/openbsc/timer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openbsc/include/openbsc/timer.h b/openbsc/include/openbsc/timer.h index ae67a5a1a..fee888bfd 100644 --- a/openbsc/include/openbsc/timer.h +++ b/openbsc/include/openbsc/timer.h @@ -44,9 +44,9 @@ struct timer_list { struct llist_head entry; struct timeval timeout; - int active : 1; - int handled : 1; - int in_list : 1; + unsigned int active : 1; + unsigned int handled : 1; + unsigned int in_list : 1; void (*cb)(void*); void *data; @@ -67,5 +67,6 @@ int bsc_timer_pending(struct timer_list *timer); struct timeval *bsc_nearest_timer(); void bsc_prepare_timers(); int bsc_update_timers(); +int bsc_timer_check(void); #endif |