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

3 files changed, 12 insertions, 0 deletions

diff --git a/auto_tests/crypto_test.c b/auto_tests/crypto_test.c
index 683cb106..09b5a982 100644
--- a/auto_tests/crypto_test.c
+++ b/auto_tests/crypto_test.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "../toxcore/net_crypto.h"
 #include <sys/types.h>
 #include <stdint.h>
diff --git a/auto_tests/friends_test.c b/auto_tests/friends_test.c
index 0426c18d..8a22aa87 100644
--- a/auto_tests/friends_test.c
+++ b/auto_tests/friends_test.c
@@ -18,6 +18,10 @@
  *      times. This is used both to ensure that we don't loop forever on a broken build,
  *      and that we don't get too slow with messaging. The current time is 15 seconds. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "../toxcore/friend_requests.h"
 #include "../toxcore/Messenger.h"
 #include <assert.h>
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index cba509ba..6677c345 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -10,6 +10,10 @@
  *      checking that status changes are received, messages can be sent, etc.
  *      All of that is done in a separate test, with two local clients running. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "../toxcore/Messenger.h"
 #include "../toxcore/Lossless_UDP.h"
 #include <sys/types.h>