Snap for 8564071 from 357f7d42d2fc961ee166622c3a383ebeff70e88d to mainline-conscrypt-releaseaml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010android13-mainline-conscrypt-release

Change-Id: Ib16a7d32b5edcee917659308908ed4eef2859f48

3 files changed, 3 insertions, 23 deletions

diff --git a/config.h b/config.h
index 7cccfc75..46a54927 100644
--- a/config.h
+++ b/config.h
@@ -978,7 +978,9 @@
 #define HAVE_SIG_ATOMIC_T 1
 
 /* Define to 1 if the system provides static_assert */
-/* #undef HAVE_STATIC_ASSERT */
+#if __STDC_VERSION__ >= 201112L
+#define HAVE_STATIC_ASSERT 1
+#endif
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
diff --git a/net.c b/net.c
index f791a92b..775e14ca 100644
--- a/net.c
+++ b/net.c
@@ -51,8 +51,6 @@
 #include <asm/types.h>
 #ifdef HAVE_NETIPX_IPX_H
 # include <netipx/ipx.h>
-#else
-# include <linux/ipx.h>
 #endif
 
 #if defined(HAVE_LINUX_IP_VS_H)
diff --git a/sockaddr.c b/sockaddr.c
index cf60c324..67604637 100644
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -47,8 +47,6 @@
 
 #ifdef HAVE_NETIPX_IPX_H
 # include <netipx/ipx.h>
-#else
-# include <linux/ipx.h>
 #endif
 
 #include "xlat/addrfams.h"
@@ -349,23 +347,6 @@ digis_end:
 		tprints(", ...");
 }
 
-static void
-print_sockaddr_data_ipx(const void *const buf, const int addrlen)
-{
-	const struct sockaddr_ipx *const sa_ipx = buf;
-	unsigned int i;
-
-	PRINT_FIELD_NET_PORT("", *sa_ipx, sipx_port);
-	tprintf(", sipx_network=htonl(%#08x)"
-		", sipx_node=[",
-		ntohl(sa_ipx->sipx_network));
-	for (i = 0; i < IPX_NODE_LEN; ++i) {
-		tprintf("%s%#02x", i ? ", " : "",
-			sa_ipx->sipx_node[i]);
-	}
-	PRINT_FIELD_0X("], ", *sa_ipx, sipx_type);
-}
-
 void
 print_x25_addr(const void /* struct x25_address */ *addr_void)
 {
@@ -605,7 +586,6 @@ static const struct {
 	[AF_UNIX] = { print_sockaddr_data_un, SIZEOF_SA_FAMILY + 1 },
 	[AF_INET] = { print_sockaddr_data_in, sizeof(struct sockaddr_in) },
 	[AF_AX25] = { print_sockaddr_data_ax25, sizeof(struct sockaddr_ax25) },
-	[AF_IPX] = { print_sockaddr_data_ipx, sizeof(struct sockaddr_ipx) },
 	[AF_X25] = { print_sockaddr_data_x25, sizeof(struct sockaddr_x25) },
 	[AF_INET6] = { print_sockaddr_data_in6, SIN6_MIN_LEN },
 	[AF_NETLINK] = { print_sockaddr_data_nl, SIZEOF_SA_FAMILY + 1 },