Get rid of the only GNU extension we used.

1 files changed, 15 insertions, 15 deletions

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);
 }