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 4c435da3648b45badf0c64675b91b3679eca8288..39d5693d7eedcb2bdc2d14aa45ee0ecc3e28b44b 100644 (file)
--- 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 d50ef831fa1b998524c2a986ead8f10233900a23..2f86c4dc3ab1f408eb04ebfa7b4f83813e2e4cb4 100644 (file)
--- 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