From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 9 Jan 2015 03:03:39 +0000 (+0000)
Subject: Fix build on systems that lack NETLINK_SOCK_DIAG definition
X-Git-Tag: v4.10~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9f7e7a4392a5fb38b3c60825fedddb28f30572f;p=strace

Fix build on systems that lack NETLINK_SOCK_DIAG definition

NETLINK_INET_DIAG was introduced in linux v2.6.14,
NETLINK_SOCK_DIAG was added much later in linux v3.3.

* net.c [!NETLINK_SOCK_DIAG && NETLINK_INET_DIAG]
(NETLINK_SOCK_DIAG): Define.
* socketutils.c: Likewise.
* tests/netlink_unix_diag.c: Likewise.
---

diff --git a/net.c b/net.c
index 0f88c429..40a18d02 100644
--- a/net.c
+++ b/net.c
@@ -112,7 +112,10 @@
 #include "xlat/inet_protocols.h"
 
 #ifdef PF_NETLINK
-#include "xlat/netlink_protocols.h"
+# if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
+#  define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
+# endif
+# include "xlat/netlink_protocols.h"
 #endif
 
 #if defined(HAVE_BLUETOOTH_BLUETOOTH_H)
diff --git a/socketutils.c b/socketutils.c
index 0605aad2..93bb0c3c 100644
--- a/socketutils.c
+++ b/socketutils.c
@@ -8,6 +8,10 @@
 #include <linux/unix_diag.h>
 #include <linux/rtnetlink.h>
 
+#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
+# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
+#endif
+
 #include <sys/un.h>
 #ifndef UNIX_PATH_MAX
 # define UNIX_PATH_MAX sizeof(((struct sockaddr_un *) 0)->sun_path)
diff --git a/tests/netlink_unix_diag.c b/tests/netlink_unix_diag.c
index 21b8f069..979ab88d 100644
--- a/tests/netlink_unix_diag.c
+++ b/tests/netlink_unix_diag.c
@@ -9,6 +9,10 @@
 #include <linux/sock_diag.h>
 #include <linux/unix_diag.h>
 
+#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
+# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
+#endif
+
 static int
 send_query(const int fd, const int family, const int proto)
 {