diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-02-27 23:02:26 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-02-27 23:02:26 +0100 |
| commit | 045ea3eb7bda56e9e60e40c85f4870eda05cb2b4 (patch) | |
| tree | b01bfd2970a2cf5045030b46fcc2734c198f94b2 /firmware/libosmocore | |
| parent | d09829dcc60437dd350a127c5640e8758530c643 (diff) | |
timer.h: Fix compiler warnings about redefinition
Diffstat (limited to 'firmware/libosmocore')
| -rw-r--r-- | firmware/libosmocore/include/osmocom/core/timer.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/firmware/libosmocore/include/osmocom/core/timer.h b/firmware/libosmocore/include/osmocom/core/timer.h index c6d46e1..2f62b20 100644 --- a/firmware/libosmocore/include/osmocom/core/timer.h +++ b/firmware/libosmocore/include/osmocom/core/timer.h @@ -32,10 +32,29 @@ struct osmo_timeval { unsigned long expires; }; +#ifdef timerisset +#undef timerisset +#endif #define timerisset(tvp) ((tvp)->expires) + +#ifdef timerclear +#undef timerclear +#endif #define timerclear(tvp) (tvp)->expires = 0 + +#ifdef timercmp +#undef timercmp +#endif #define timercmp(a, b, CMP) (a)->expires CMP (b)->expires + +#ifdef timersub +#undef timersub +#endif #define timersub(a, b, result) (result)->expires = (a)->expires - (b)->expires + +#ifdef timeradd +#undef timeradd +#endif #define timeradd(a, b, result) (result)->expires = (a)->expires + (b)->expires struct timezone; |