Get rid of the only GNU extension we used.

4 files changed, 27 insertions, 27 deletions

diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 26a95942..2ae94618 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -39,10 +39,10 @@ static inline IP get_loopback()
     IP ip;
 #if USE_IPV6
     ip.family = TOX_AF_INET6;
-    ip.ip6 = get_ip6_loopback();
+    ip.ip.v6 = get_ip6_loopback();
 #else
     ip.family = TOX_AF_INET;
-    ip.ip4 = get_ip4_loopback();
+    ip.ip.v4 = get_ip4_loopback();
 #endif
     return ip;
 }
diff --git a/auto_tests/dht_test.c b/auto_tests/dht_test.c
index 8e735dbd..10c9c7bf 100644
--- a/auto_tests/dht_test.c
+++ b/auto_tests/dht_test.c
@@ -38,10 +38,10 @@ static inline IP get_loopback()
     IP ip;
 #if USE_IPV6
     ip.family = TOX_AF_INET6;
-    ip.ip6 = get_ip6_loopback();
+    ip.ip.v6 = get_ip6_loopback();
 #else
     ip.family = TOX_AF_INET;
-    ip.ip4 = get_ip4_loopback();
+    ip.ip.v4 = get_ip4_loopback();
 #endif
     return ip;
 }
@@ -489,7 +489,7 @@ static void test_list_main(void)
 
             IP_Port ip_port;
             ip_init(&ip_port.ip, 0);
-            ip_port.ip.ip4.uint32 = rand();
+            ip_port.ip.ip.v4.uint32 = rand();
             ip_port.port = rand() % (UINT16_MAX - 1);
             ++ip_port.port;
             addto_lists(dhts[j], ip_port, dhts[i]->self_public_key);
@@ -723,11 +723,11 @@ static void random_ip(IP_Port *ipp, int family)
     size_t size;
 
     if (family == TOX_AF_INET || family == TCP_INET) {
-        ip = (uint8_t *)&ipp->ip.ip4;
-        size = sizeof(ipp->ip.ip4);
+        ip = (uint8_t *)&ipp->ip.ip.v4;
+        size = sizeof(ipp->ip.ip.v4);
     } else if (family == TOX_AF_INET6 || family == TCP_INET6) {
-        ip = (uint8_t *)&ipp->ip.ip6;
-        size = sizeof(ipp->ip.ip6);
+        ip = (uint8_t *)&ipp->ip.ip.v6;
+        size = sizeof(ipp->ip.ip.v6);
     } else {
         return;
     }
diff --git a/auto_tests/network_test.c b/auto_tests/network_test.c
index 1885c81f..f05f0dbd 100644
--- a/auto_tests/network_test.c
+++ b/auto_tests/network_test.c
@@ -43,7 +43,7 @@ START_TEST(test_addr_resolv_localhost)
     char ip_str[IP_NTOA_LEN];
     ck_assert_msg(ip.family == TOX_AF_INET, "Expected family TOX_AF_INET, got %u.", ip.family);
     const uint32_t loopback = get_ip4_loopback().uint32;
-    ck_assert_msg(ip.ip4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
+    ck_assert_msg(ip.ip.v4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
                   ip_ntoa(&ip, ip_str, sizeof(ip_str)));
 
     ip_init(&ip, 1); // ipv6enabled = 1
@@ -58,7 +58,7 @@ START_TEST(test_addr_resolv_localhost)
 
     ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family);
     IP6 ip6_loopback = get_ip6_loopback();
-    ck_assert_msg(!memcmp(&ip.ip6, &ip6_loopback, sizeof(IP6)), "Expected ::1, got %s.",
+    ck_assert_msg(!memcmp(&ip.ip.v6, &ip6_loopback, sizeof(IP6)), "Expected ::1, got %s.",
                   ip_ntoa(&ip, ip_str, sizeof(ip_str)));
 
     if (localhost_split) {
@@ -75,15 +75,15 @@ START_TEST(test_addr_resolv_localhost)
 
 #if USE_IPV6
     ck_assert_msg(ip.family == TOX_AF_INET6, "Expected family TOX_AF_INET6 (%u), got %u.", TOX_AF_INET6, ip.family);
-    ck_assert_msg(!memcmp(&ip.ip6, &ip6_loopback, sizeof(IP6)), "Expected ::1, got %s.",
+    ck_assert_msg(!memcmp(&ip.ip.v6, &ip6_loopback, sizeof(IP6)), "Expected ::1, got %s.",
                   ip_ntoa(&ip, ip_str, sizeof(ip_str)));
 
     ck_assert_msg(extra.family == TOX_AF_INET, "Expected family TOX_AF_INET (%u), got %u.", TOX_AF_INET, extra.family);
-    ck_assert_msg(extra.ip4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
+    ck_assert_msg(extra.ip.v4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
                   ip_ntoa(&ip, ip_str, sizeof(ip_str)));
 #else
     ck_assert_msg(ip.family == TOX_AF_INET, "Expected family TOX_AF_INET (%u), got %u.", TOX_AF_INET, ip.family);
-    ck_assert_msg(ip.ip4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
+    ck_assert_msg(ip.ip.v4.uint32 == loopback, "Expected 127.0.0.1, got %s.",
                   ip_ntoa(&ip, ip_str, sizeof(ip_str)));
 #endif
 }
@@ -106,32 +106,32 @@ START_TEST(test_ip_equal)
     ck_assert_msg(res == 0, "ip_equal(NULL, PTR): expected result 0, got %u.", res);
 
     ip1.family = TOX_AF_INET;
-    ip1.ip4.uint32 = net_htonl(0x7F000001);
+    ip1.ip.v4.uint32 = net_htonl(0x7F000001);
 
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_UNSPEC, 0} ): "
                   "expected result 0, got %u.", res);
 
     ip2.family = TOX_AF_INET;
-    ip2.ip4.uint32 = net_htonl(0x7F000001);
+    ip2.ip.v4.uint32 = net_htonl(0x7F000001);
 
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res != 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET, 127.0.0.1} ): "
                   "expected result != 0, got 0.");
 
-    ip2.ip4.uint32 = net_htonl(0x7F000002);
+    ip2.ip.v4.uint32 = net_htonl(0x7F000002);
 
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET, 127.0.0.2} ): "
                   "expected result 0, got %u.", res);
 
     ip2.family = TOX_AF_INET6;
-    ip2.ip6.uint32[0] = 0;
-    ip2.ip6.uint32[1] = 0;
-    ip2.ip6.uint32[2] = net_htonl(0xFFFF);
-    ip2.ip6.uint32[3] = net_htonl(0x7F000001);
+    ip2.ip.v6.uint32[0] = 0;
+    ip2.ip.v6.uint32[1] = 0;
+    ip2.ip.v6.uint32[2] = net_htonl(0xFFFF);
+    ip2.ip.v6.uint32[3] = net_htonl(0x7F000001);
 
-    ck_assert_msg(IPV6_IPV4_IN_V6(ip2.ip6) != 0,
+    ck_assert_msg(IPV6_IPV4_IN_V6(ip2.ip.v6) != 0,
                   "IPV6_IPV4_IN_V6(::ffff:127.0.0.1): expected != 0, got 0.");
 
     res = ip_equal(&ip1, &ip2);
@@ -139,7 +139,7 @@ START_TEST(test_ip_equal)
                   "expected result != 0, got 0.");
 
     IP6 ip6_loopback = get_ip6_loopback();
-    memcpy(&ip2.ip6, &ip6_loopback, sizeof(IP6));
+    memcpy(&ip2.ip.v6, &ip6_loopback, sizeof(IP6));
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET, 127.0.0.1}, {TOX_AF_INET6, ::1} ): expected result 0, got %u.", res);
 
@@ -147,7 +147,7 @@ START_TEST(test_ip_equal)
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res != 0, "ip_equal( {TOX_AF_INET6, ::1}, {TOX_AF_INET6, ::1} ): expected result != 0, got 0.");
 
-    ip2.ip6.uint8[15]++;
+    ip2.ip.v6.uint8[15]++;
     res = ip_equal(&ip1, &ip2);
     ck_assert_msg(res == 0, "ip_equal( {TOX_AF_INET6, ::1}, {TOX_AF_INET6, ::2} ): expected result 0, got %u.", res);
 }
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index 5989df17..aa505a0b 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -30,10 +30,10 @@ static inline IP get_loopback()
     IP ip;
 #if USE_IPV6
     ip.family = TOX_AF_INET6;
-    ip.ip6 = get_ip6_loopback();
+    ip.ip.v6 = get_ip6_loopback();
 #else
     ip.family = TOX_AF_INET;
-    ip.ip4 = get_ip4_loopback();
+    ip.ip.v4 = get_ip4_loopback();
 #endif
     return ip;
 }
@@ -308,7 +308,7 @@ typedef struct {
 static Onions *new_onions(uint16_t port)
 {
     IP ip = get_loopback();
-    ip.ip6.uint8[15] = 1;
+    ip.ip.v6.uint8[15] = 1;
     Onions *on = (Onions *)malloc(sizeof(Onions));
 
     if (!on) {