From ff05f2ffc3caea6c59b6c940aa80e1314783a070 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgr@lsx.localdomain>
Date: Tue, 17 Jun 2008 02:57:33 +0200
Subject: [PATCH] Fix compile errors when linking against libnl-genl

---
 include/netlink-types.h     | 9 ---------
 include/netlink/genl/mngt.h | 9 +++++++++
 src/nl-list-caches.c        | 1 +
 src/utils.c                 | 1 +
 src/utils.h                 | 1 -
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/netlink-types.h b/include/netlink-types.h
index a818f99..be5fc4e 100644
--- 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 467922a..8b0244f 100644
--- 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 9bb57c7..281be00 100644
--- 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 e00275f..b73a143 100644
--- 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 12f7c52..a5c94e6 100644
--- 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>