1 files changed, 8 insertions, 13 deletions

diff --git a/toxcore/util.h b/toxcore/util.h
index 955ce8c4..7cd6bb8b 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -27,8 +27,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <pthread.h>
 
-#define inline__ inline __attribute__((always_inline))
+#define MIN(a,b) (((a)<(b))?(a):(b))
 
 void unix_time_update();
 uint64_t unix_time();
@@ -42,22 +43,16 @@ uint32_t id_copy(uint8_t *dest, const uint8_t *src); /* return value is CLIENT_I
 void host_to_net(uint8_t *num, uint16_t numbytes);
 #define net_to_host(x, y) host_to_net(x, y)
 
+uint16_t lendian_to_host16(uint16_t lendian);
+#define host_tolendian16(x) lendian_to_host16(x)
+
+void host_to_lendian32(uint8_t *dest,  uint32_t num);
+
 /* state load/save */
 typedef int (*load_state_callback_func)(void *outer, const uint8_t *data, uint32_t len, uint16_t type);
 int load_state(load_state_callback_func load_state_callback, void *outer,
                const uint8_t *data, uint32_t length, uint16_t cookie_inner);
 
-/* Converts 4 bytes to uint32_t */
-void bytes_to_U32(uint32_t *dest, const uint8_t *bytes);
-
-/* Converts 2 bytes to uint16_t */
-void bytes_to_U16(uint16_t *dest, const uint8_t *bytes);
-
-/* Convert uint32_t to byte string of size 4 */
-void U32_to_bytes(uint8_t *dest, uint32_t value);
-
-/* Convert uint16_t to byte string of size 2 */
-void U16_to_bytes(uint8_t *dest, uint16_t value);
-
+int create_recursive_mutex(pthread_mutex_t *mutex);
 
 #endif /* __UTIL_H__ */