Merge remote-tracking branch 'upstream/master' into MessengerLoadSave

Conflicts:
	toxcore/Messenger.c
	toxcore/util.c
	toxcore/util.h

1 files changed, 12 insertions, 1 deletions

diff --git a/toxcore/util.h b/toxcore/util.h
index 00482862..6937f7d4 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -8,9 +8,11 @@
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
+#include <stdbool.h>
+#include <stdint.h>
+
 uint64_t now();
 uint64_t random_64b();
-bool ipp_eq(IP_Port a, IP_Port b);
 bool id_eq(uint8_t *dest, uint8_t *src);
 void id_cpy(uint8_t *dest, uint8_t *src);
 
@@ -18,4 +20,13 @@ typedef int (*load_state_callback_func)(void *outer, uint8_t *data, uint32_t len
 int load_state(load_state_callback_func load_state_callback, void *outer,
                         uint8_t *data, uint32_t length, uint16_t cookie_inner);
 
+#undef LOGGING
+/* #define LOGGING */
+#ifdef LOGGING
+extern char logbuffer[512];
+void loginit(uint16_t port);
+void loglog(char *text);
+void logexit();
+#endif
+
 #endif /* __UTIL_H__ */