From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 10 Apr 2017 00:20:34 +0000 (+0000)
Subject: Do not include xlat/netlink_protocols.h twice
X-Git-Tag: v4.17~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c25635603edcfbe903094afd7eef2cfef55464a;p=strace

Do not include xlat/netlink_protocols.h twice

Make netlink_protocols a global xlat array defined in net.c file.

* defs.h (netlink_protocols): New prototype.
* socketutils.c: Stop including "xlat/netlink_protocols.h".
---

diff --git a/defs.h b/defs.h
index 4c435da3..39d5693d 100644
--- a/defs.h
+++ b/defs.h
@@ -297,6 +297,7 @@ extern const struct xlat clocknames[];
 extern const struct xlat dirent_types[];
 extern const struct xlat evdev_abs[];
 extern const struct xlat msg_flags[];
+extern const struct xlat netlink_protocols[];
 extern const struct xlat open_access_modes[];
 extern const struct xlat open_mode_flags[];
 extern const struct xlat resource_flags[];
diff --git a/socketutils.c b/socketutils.c
index d50ef831..2f86c4dc 100644
--- a/socketutils.c
+++ b/socketutils.c
@@ -36,7 +36,6 @@
 #include <linux/unix_diag.h>
 #include <linux/netlink_diag.h>
 #include <linux/rtnetlink.h>
-#include "xlat/netlink_protocols.h"
 
 #include <sys/un.h>
 #ifndef UNIX_PATH_MAX