diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | include/netlink-private/netlink.h | 1 | ||||
| -rw-r--r-- | include/netlink-private/types.h | 3 | ||||
| -rw-r--r-- | include/nl-shared-core/object-api.h (renamed from include/netlink-private/object-api.h) | 0 | ||||
| -rwxr-xr-x | tools/clang-format.sh | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index d85b0fd..249e997 100644 --- a/Makefile.am +++ b/Makefile.am @@ -272,13 +272,13 @@ noinst_HEADERS = \ include/linux-private/linux/veth.h \ include/linux-private/linux/xfrm.h \ include/netlink-private/netlink.h \ - include/netlink-private/object-api.h \ include/netlink-private/types.h \ include/nl-aux-core/nl-core.h \ include/nl-aux-route/nl-route.h \ include/nl-hidden-route/nl-hidden-route.h \ include/nl-intern-route/nl-intern-route.h \ include/nl-shared-core/cache-api.h \ + include/nl-shared-core/object-api.h \ $(NULL) ############################################################################### diff --git a/include/netlink-private/netlink.h b/include/netlink-private/netlink.h index 22881d5..4772766 100644 --- a/include/netlink-private/netlink.h +++ b/include/netlink-private/netlink.h @@ -58,7 +58,6 @@ #include <netlink/handlers.h> #include <netlink/cache.h> #include <netlink/route/tc.h> -#include <netlink-private/object-api.h> #include <netlink-private/types.h> #include "nl-shared-core/cache-api.h" diff --git a/include/netlink-private/types.h b/include/netlink-private/types.h index 8c57296..edc45a2 100644 --- a/include/netlink-private/types.h +++ b/include/netlink-private/types.h @@ -14,7 +14,6 @@ #include <netlink/route/route.h> #include <netlink/idiag/idiagnl.h> #include <netlink/netfilter/ct.h> -#include <netlink-private/object-api.h> #include <netlink/route/link/sriov.h> #include <netlink/route/nh.h> #include <linux/netlink.h> @@ -30,6 +29,8 @@ #include <netinet/in.h> +#include "nl-shared-core/object-api.h" + #define NL_SOCK_PASSCRED (1<<1) #define NL_OWN_PORT (1<<2) #define NL_MSG_PEEK (1<<3) diff --git a/include/netlink-private/object-api.h b/include/nl-shared-core/object-api.h index a539e37..a539e37 100644 --- a/include/netlink-private/object-api.h +++ b/include/nl-shared-core/object-api.h diff --git a/tools/clang-format.sh b/tools/clang-format.sh index 33b5f17..e4b22f0 100755 --- a/tools/clang-format.sh +++ b/tools/clang-format.sh @@ -15,7 +15,6 @@ EXCLUDE_PATHS_TOPLEVEL=( # Exclude them too. EXCLUDE_PATHS_TOPLEVEL+=( "include/netlink-private/netlink.h" - "include/netlink-private/object-api.h" "include/netlink-private/types.h" "include/netlink/addr.h" "include/netlink/attr.h" @@ -137,6 +136,7 @@ EXCLUDE_PATHS_TOPLEVEL+=( "include/netlink/xfrm/sp.h" "include/netlink/xfrm/template.h" "include/nl-shared-core/cache-api.h" + "include/nl-shared-core/object-api.h" "lib/addr.c" "lib/attr.c" "lib/cache.c" |