diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-01-23 13:17:43 +0100 |
|---|---|---|
| committer | Thomas Graf <tgraf@suug.ch> | 2013-01-23 13:37:29 +0100 |
| commit | 1419851eb46aa5823c27792c3d4bb6a2b55ca9f4 (patch) | |
| tree | a37979a271ad7883cfb891fa8f79c6bcd9bfccdf | |
| parent | 26e22d887e2842eaf993dd3b743ce620e0c7eb46 (diff) | |
| download | libnl-1419851eb46aa5823c27792c3d4bb6a2b55ca9f4.tar.gz | |
fix includes after removing some headers
commit f20bbe1f07fcff1509425884f5ed72ca8d5fb6ab
Author: Thomas Graf <tgraf@suug.ch>
Date: Tue Jan 22 19:10:38 2013 +0100
No longer install module API headers
This commit causes a regression so no app using libnl can be compiled
against it. This patch fixes it by removing includes of no-longe
existing headers.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
| -rw-r--r-- | include/netlink/cache-api.h | 3 | ||||
| -rw-r--r-- | include/netlink/cache.h | 2 | ||||
| -rw-r--r-- | include/netlink/cli/tc.h | 4 | ||||
| -rw-r--r-- | include/netlink/netlink.h | 3 | ||||
| -rw-r--r-- | include/netlink/route/tc-api.h | 7 | ||||
| -rw-r--r-- | include/netlink/route/tc.h | 7 |
6 files changed, 14 insertions, 12 deletions
diff --git a/include/netlink/cache-api.h b/include/netlink/cache-api.h index b332415..493a551 100644 --- a/include/netlink/cache-api.h +++ b/include/netlink/cache-api.h @@ -13,13 +13,12 @@ #define NETLINK_CACHE_API_H_ #include <netlink/netlink.h> +#include <netlink/cache.h> #ifdef __cplusplus extern "C" { #endif -typedef void (*change_func_t)(struct nl_cache *, struct nl_object *, int, void *); - /** * @ingroup cache * @defgroup cache_api Cache Implementation diff --git a/include/netlink/cache.h b/include/netlink/cache.h index ac03842..0da1377 100644 --- a/include/netlink/cache.h +++ b/include/netlink/cache.h @@ -16,13 +16,13 @@ #include <netlink/msg.h> #include <netlink/utils.h> #include <netlink/object.h> -#include <netlink/cache-api.h> #ifdef __cplusplus extern "C" { #endif struct nl_cache; +typedef void (*change_func_t)(struct nl_cache *, struct nl_object *, int, void *); /** * @ingroup cache diff --git a/include/netlink/cli/tc.h b/include/netlink/cli/tc.h index 85d2e30..77042c7 100644 --- a/include/netlink/cli/tc.h +++ b/include/netlink/cli/tc.h @@ -12,7 +12,9 @@ #ifndef __NETLINK_CLI_TC_H_ #define __NETLINK_CLI_TC_H_ -#include <netlink/route/tc-api.h> +#include <netlink/route/tc.h> + +struct rtnl_tc_ops; extern void nl_cli_tc_parse_dev(struct rtnl_tc *, struct nl_cache *, char *); extern void nl_cli_tc_parse_parent(struct rtnl_tc *, char *); diff --git a/include/netlink/netlink.h b/include/netlink/netlink.h index a501eaa..5f68548 100644 --- a/include/netlink/netlink.h +++ b/include/netlink/netlink.h @@ -32,13 +32,14 @@ #include <netlink/handlers.h> #include <netlink/socket.h> #include <netlink/object.h> -#include <netlink/cache-api.h> #ifdef __cplusplus extern "C" { #endif struct ucred; +struct nl_cache_ops; +struct nl_parser_param; extern int nl_debug; extern struct nl_dump_params nl_debug_dp; diff --git a/include/netlink/route/tc-api.h b/include/netlink/route/tc-api.h index d89408f..601a8df 100644 --- a/include/netlink/route/tc-api.h +++ b/include/netlink/route/tc-api.h @@ -20,13 +20,6 @@ extern "C" { #endif -enum rtnl_tc_type { - RTNL_TC_TYPE_QDISC, - RTNL_TC_TYPE_CLASS, - RTNL_TC_TYPE_CLS, - __RTNL_TC_TYPE_MAX, -}; - #define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1) /** diff --git a/include/netlink/route/tc.h b/include/netlink/route/tc.h index 50ca6de..caee60c 100644 --- a/include/netlink/route/tc.h +++ b/include/netlink/route/tc.h @@ -23,6 +23,13 @@ extern "C" { #endif +enum rtnl_tc_type { + RTNL_TC_TYPE_QDISC, + RTNL_TC_TYPE_CLASS, + RTNL_TC_TYPE_CLS, + __RTNL_TC_TYPE_MAX, +}; + /** * Compute tc handle based on major and minor parts * @ingroup tc |