diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-25 23:49:29 +0000 |
| commit | 36318d1929e9437df0402a78ff63a70f78d6a89e (patch) | |
| tree | 38588eaa8b400d7abf384a17e21dea75b104b177 /libddekit/timer.c | |
| parent | eaa21da4ea94937a1bc2157c042a233d524d17ce (diff) | |
| parent | d261675a592f6109826ccbdb07c7f485c4c88683 (diff) | |
Merge branch 'dde-upstream' into dde
Conflicts:
dde_e100/Makefile
dde_e1000/Makefile
dde_ne2k_pci/Makefile
dde_pcnet32/Makefile
dde_rtl8139/Makefile
Diffstat (limited to 'libddekit/timer.c')
| -rw-r--r-- | libddekit/timer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libddekit/timer.c b/libddekit/timer.c index a8a91a85..169f867c 100644 --- a/libddekit/timer.c +++ b/libddekit/timer.c @@ -1,6 +1,5 @@ #include <error.h> #include <maptime.h> -#include <cthreads.h> #include <stdio.h> #include "ddekit/lock.h" @@ -322,12 +321,12 @@ void ddekit_init_timers(void) { error_t err; struct timeval tp; - static boolean_t initialized = FALSE; + static int initialized = 0; if (initialized) return; - initialized = TRUE; + initialized = 1; err = maptime_map (0, 0, &mapped_time); if (err) error (2, err, "cannot map time device"); |
