diff options
| author | George Hazan <ghazan@miranda.im> | 2019-01-16 21:13:32 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-01-16 21:13:32 +0300 |
| commit | 2ad44a4cd4f811d6c7da5c8e9e31acf6e0152c79 (patch) | |
| tree | 0585db93be035ea25d807b788ccfc4c7217c7587 /protocols/Tox/libtox/src/toxcore/util.c | |
| parent | 8fc53a06b7a8163d61c06fbde88ffea904222bdd (diff) | |
fixes #1767 (Update toxcore to 0.2.9)
Diffstat (limited to 'protocols/Tox/libtox/src/toxcore/util.c')
| -rw-r--r-- | protocols/Tox/libtox/src/toxcore/util.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/protocols/Tox/libtox/src/toxcore/util.c b/protocols/Tox/libtox/src/toxcore/util.c index adc0dc09dc..73e16c4585 100644 --- a/protocols/Tox/libtox/src/toxcore/util.c +++ b/protocols/Tox/libtox/src/toxcore/util.c @@ -95,21 +95,53 @@ int create_recursive_mutex(pthread_mutex_t *mutex) return 0; } +int16_t max_s16(int16_t a, int16_t b) +{ + return a > b ? a : b; +} int32_t max_s32(int32_t a, int32_t b) { return a > b ? a : b; } +int64_t max_s64(int64_t a, int64_t b) +{ + return a > b ? a : b; +} +int16_t min_s16(int16_t a, int16_t b) +{ + return a < b ? a : b; +} int32_t min_s32(int32_t a, int32_t b) { return a < b ? a : b; } +int64_t min_s64(int64_t a, int64_t b) +{ + return a < b ? a : b; +} + +uint16_t max_u16(uint16_t a, uint16_t b) +{ + return a > b ? a : b; +} +uint32_t max_u32(uint32_t a, uint32_t b) +{ + return a > b ? a : b; +} +uint64_t max_u64(uint64_t a, uint64_t b) +{ + return a > b ? a : b; +} +uint16_t min_u16(uint16_t a, uint16_t b) +{ + return a < b ? a : b; +} uint32_t min_u32(uint32_t a, uint32_t b) { return a < b ? a : b; } - uint64_t min_u64(uint64_t a, uint64_t b) { return a < b ? a : b; |
