Revert "Portability fixes"

This reverts commit f3469070fe899e8e4fd88665386a55bad9f77cd8.

11 files changed, 5 insertions, 26 deletions

diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 6a439261..d9013378 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/conference_test.c b/auto_tests/conference_test.c
index 36707e0f..aa2f8e13 100644
--- a/auto_tests/conference_test.c
+++ b/auto_tests/conference_test.c
@@ -1,8 +1,6 @@
 /* Auto Tests: Conferences.
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -177,7 +175,7 @@ group_test_restart:
          * Either way in this case it's fine  */
         if (peer_count != NUM_GROUP_TOX) {
             ++test_run;
-            printf("\tError starting up the first group (peer_count %" PRIu32 " != %d, test_run = %d)\n", peer_count, NUM_GROUP_TOX,
+            printf("\tError starting up the first group (peer_count %"PRIu32" != %d, test_run = %d)\n", peer_count, NUM_GROUP_TOX,
                    test_run);
 
             for (j = 0; j < NUM_GROUP_TOX; ++j) {
@@ -196,7 +194,7 @@ group_test_restart:
          * important again.
          */
         ck_assert_msg(peer_count == NUM_GROUP_TOX, "\n\tBad number of group peers (pre check)."
-                      "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %" PRIu32 "\n\n",
+                      "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %"PRIu32"\n\n",
                       NUM_GROUP_TOX, i, peer_count);
 
         uint8_t title[2048];
@@ -243,7 +241,7 @@ group_test_restart:
         for (i = 0; i < (k - 1); ++i) {
             uint32_t peer_count = tox_conference_peer_count(toxes[i], 0, NULL);
             ck_assert_msg(peer_count == (k - 1), "\n\tBad number of group peers (post check)."
-                          "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %" PRIu32 "\n\n",
+                          "\n\t\t\tExpected: %u but tox_instance(%u)  only has: %"PRIu32"\n\n",
                           (k - 1), i, peer_count);
         }
     }
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 633e7002..9cec1643 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c
index ca918778..783f3f7b 100644
--- a/auto_tests/network_test.c
+++ b/auto_tests/network_test.c
@@ -114,8 +114,8 @@ START_TEST(test_ip_equal)
     ip2.ip6.uint32[2] = htonl(0xFFFF);
     ip2.ip6.uint32[3] = htonl(0x7F000001);
 
-    ck_assert_msg(IPV6_IPV4_IN_V6(ip2.ip6) != 0,
-                  "IPV6_IPV4_IN_V6(::ffff:127.0.0.1): expected != 0, got 0.");
+    ck_assert_msg(IN6_IS_ADDR_V4MAPPED(&ip2.ip6.in6_addr) != 0,
+                  "IN6_IS_ADDR_V4MAPPED(::ffff:127.0.0.1): expected != 0, got 0.");
 
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res != 0, "ip_equal( {AF_INET, 127.0.0.1}, {AF_INET6, ::ffff:127.0.0.1} ): expected result != 0, got 0.");
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index 05264927..44ea9c7d 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/save_friend_test.c b/auto_tests/save_friend_test.c
index 448160c0..9d36ff2d 100644
--- a/auto_tests/save_friend_test.c
+++ b/auto_tests/save_friend_test.c
@@ -1,10 +1,7 @@
 /* Auto Tests: Save and load friends.
  */
 
-#define _XOPEN_SOURCE 600
-
 #include "helpers.h"
-#include "../toxcore/tox.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/auto_tests/tox_many_tcp_test.c b/auto_tests/tox_many_tcp_test.c
index 48f5671c..197c6e47 100644
--- a/auto_tests/tox_many_tcp_test.c
+++ b/auto_tests/tox_many_tcp_test.c
@@ -1,8 +1,6 @@
 /* Auto Tests: Many TCP.
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/tox_many_test.c b/auto_tests/tox_many_test.c
index b44bbb0c..0c4c8c7d 100644
--- a/auto_tests/tox_many_test.c
+++ b/auto_tests/tox_many_test.c
@@ -1,8 +1,6 @@
 /* Auto Tests: Many clients.
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index ab2202d1..dfd1d80a 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -10,8 +10,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index 79f552de..767fca87 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index 1a10db44..b33b93c8 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -1,5 +1,3 @@
-#define _XOPEN_SOURCE 600
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif