diff options
Diffstat (limited to 'toxcore/util.c')
-rw-r--r-- | toxcore/util.c | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/toxcore/util.c b/toxcore/util.c index adc0dc09..73e16c45 100644 --- a/toxcore/util.c +++ b/toxcore/util.c | |||
@@ -95,21 +95,53 @@ int create_recursive_mutex(pthread_mutex_t *mutex) | |||
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |
97 | 97 | ||
98 | int16_t max_s16(int16_t a, int16_t b) | ||
99 | { | ||
100 | return a > b ? a : b; | ||
101 | } | ||
98 | int32_t max_s32(int32_t a, int32_t b) | 102 | int32_t max_s32(int32_t a, int32_t b) |
99 | { | 103 | { |
100 | return a > b ? a : b; | 104 | return a > b ? a : b; |
101 | } | 105 | } |
106 | int64_t max_s64(int64_t a, int64_t b) | ||
107 | { | ||
108 | return a > b ? a : b; | ||
109 | } | ||
102 | 110 | ||
111 | int16_t min_s16(int16_t a, int16_t b) | ||
112 | { | ||
113 | return a < b ? a : b; | ||
114 | } | ||
103 | int32_t min_s32(int32_t a, int32_t b) | 115 | int32_t min_s32(int32_t a, int32_t b) |
104 | { | 116 | { |
105 | return a < b ? a : b; | 117 | return a < b ? a : b; |
106 | } | 118 | } |
119 | int64_t min_s64(int64_t a, int64_t b) | ||
120 | { | ||
121 | return a < b ? a : b; | ||
122 | } | ||
123 | |||
124 | uint16_t max_u16(uint16_t a, uint16_t b) | ||
125 | { | ||
126 | return a > b ? a : b; | ||
127 | } | ||
128 | uint32_t max_u32(uint32_t a, uint32_t b) | ||
129 | { | ||
130 | return a > b ? a : b; | ||
131 | } | ||
132 | uint64_t max_u64(uint64_t a, uint64_t b) | ||
133 | { | ||
134 | return a > b ? a : b; | ||
135 | } | ||
107 | 136 | ||
137 | uint16_t min_u16(uint16_t a, uint16_t b) | ||
138 | { | ||
139 | return a < b ? a : b; | ||
140 | } | ||
108 | uint32_t min_u32(uint32_t a, uint32_t b) | 141 | uint32_t min_u32(uint32_t a, uint32_t b) |
109 | { | 142 | { |
110 | return a < b ? a : b; | 143 | return a < b ? a : b; |
111 | } | 144 | } |
112 | |||
113 | uint64_t min_u64(uint64_t a, uint64_t b) | 145 | uint64_t min_u64(uint64_t a, uint64_t b) |
114 | { | 146 | { |
115 | return a < b ? a : b; | 147 | return a < b ? a : b; |