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

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>

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>

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>

other/DHT_bootstrap.c

@@ -26,6 +26,9 @@
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "../toxcore/DHT.h"
 #include "../toxcore/friend_requests.h"

other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c

@@ -32,6 +32,10 @@
 #include <arpa/inet.h> /* htons() */
 #include <string.h> /* strcpy() */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "../../toxcore/DHT.h"
 #include "../../toxcore/friend_requests.h"
 

toxcore/group_chats.c

@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "group_chats.h"