Snap for 8730993 from 43073a831a8ac38458b1c6a14595f76aa77e75bd to mainline-tzdata3-release
Change-Id: I1d7c6b549d53e926b5ef767609fb90328d564782
diff --git a/config.h b/config.h
index 46a5492..7cccfc7 100644
--- a/config.h
+++ b/config.h
@@ -978,9 +978,7 @@
#define HAVE_SIG_ATOMIC_T 1
/* Define to 1 if the system provides static_assert */
-#if __STDC_VERSION__ >= 201112L
-#define HAVE_STATIC_ASSERT 1
-#endif
+/* #undef HAVE_STATIC_ASSERT */
/* 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 775e14c..f791a92 100644
--- a/net.c
+++ b/net.c
@@ -51,6 +51,8 @@
#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 6760463..cf60c32 100644
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -47,6 +47,8 @@
#ifdef HAVE_NETIPX_IPX_H
# include <netipx/ipx.h>
+#else
+# include <linux/ipx.h>
#endif
#include "xlat/addrfams.h"
@@ -347,6 +349,23 @@
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)
{
@@ -586,6 +605,7 @@
[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 },
