catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-16 21:28:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

timer.h: Fix compiler warnings about redefinition

Browse Source
This commit is contained in:
Harald Welte
2017-02-27 23:02:26 +01:00
parent d09829dcc6
commit 045ea3eb7b
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/libosmocore/include/osmocom/core/timer.h
View File

@@ -32,10 +32,29 @@
struct osmo_timeval { struct osmo_timeval {
unsigned long expires; unsigned long expires;
}; };
#ifdef timerisset
#undef timerisset
#endif
#define timerisset(tvp) ((tvp)->expires) #define timerisset(tvp) ((tvp)->expires)
#ifdef timerclear
#undef timerclear
#endif
#define timerclear(tvp) (tvp)->expires = 0 #define timerclear(tvp) (tvp)->expires = 0
#ifdef timercmp
#undef timercmp
#endif
#define timercmp(a, b, CMP) (a)->expires CMP (b)->expires #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 #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 #define timeradd(a, b, result) (result)->expires = (a)->expires + (b)->expires
struct timezone; struct timezone;