Fix compile errors when linking against libnl-genl

diff --git a/include/netlink-types.h b/include/netlink-types.h
index a818f996d35de9b0195cfe744588770073dc6ee7..be5fc4e2b5aa16d42ab85b7a117424d2b019f207 100644 (file)
--- a/include/netlink-types.h
+++ b/include/netlink-types.h
@@ -95,15 +95,6 @@ struct nl_cache_mngr
 
 struct nl_parser_param;
 
-struct genl_info
-{
-       struct sockaddr_nl *    who;
-       struct nlmsghdr *       nlh;
-       struct genlmsghdr *     genlhdr;
-       void *                  userhdr;
-       struct nlattr **        attrs;
-};
-
 #define LOOSE_COMPARISON       1
 
 #define NL_OBJ_MARK            1

diff --git a/include/netlink/genl/mngt.h b/include/netlink/genl/mngt.h
index 467922a515a0891e3c967ac6af5df0840dffd5c5..8b0244f2cca13a7c3c13c851830a57e3608b09b4 100644 (file)
--- a/include/netlink/genl/mngt.h
+++ b/include/netlink/genl/mngt.h
@@ -22,6 +22,15 @@ extern "C" {
 
 struct nl_cache_ops;
 
+struct genl_info
+{
+       struct sockaddr_nl *    who;
+       struct nlmsghdr *       nlh;
+       struct genlmsghdr *     genlhdr;
+       void *                  userhdr;
+       struct nlattr **        attrs;
+};
+
 /**
  * @ingroup genl_mngt
  * Generic Netlink Command

diff --git a/src/nl-list-caches.c b/src/nl-list-caches.c
index 9bb57c7268f39e9ef8a356679358d4952086688a..281be003922840e84d87c16f4c3c3bb0672265c8 100644 (file)
--- a/src/nl-list-caches.c
+++ b/src/nl-list-caches.c
@@ -10,6 +10,7 @@
  */
 
 #include "utils.h"
+#include <netlink-local.h>
 
 static void print_usage(void)
 {

diff --git a/src/utils.c b/src/utils.c
index e00275f71416c2212f28b5e601045e65d8b949f2..b73a1436f90551054be03ca918e298bc93488784 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -12,6 +12,7 @@
 #include "utils.h"
 
 #include <stdlib.h>
+#include <stdarg.h>
 
 uint32_t parse_u32(const char *arg)
 {

diff --git a/src/utils.h b/src/utils.h
index 12f7c52ef4a7dc5f9d81c6567781e2244fa32c6e..a5c94e6e8b298f768752dc62f86a49ee949c7d73 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <netlink-local.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
 #include <netlink/addr.h>