From d668c4a94192269235510fa7d23e324ed1155a78 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Mon, 15 Dec 2014 14:10:38 +0100 Subject: [PATCH] lib: Move token-bucket.h to Signed-off-by: Thomas Graf Acked-by: Ben Pfaff --- include/openvswitch/automake.mk | 1 + {lib => include/openvswitch}/token-bucket.h | 4 ++-- lib/automake.mk | 1 - lib/token-bucket.c | 2 +- lib/vlog.h | 2 +- ofproto/pinsched.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename {lib => include/openvswitch}/token-bucket.h (95%) diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index d9f551d6b..7e225bb1d 100644 --- a/include/openvswitch/automake.mk +++ b/include/openvswitch/automake.mk @@ -2,6 +2,7 @@ openvswitchincludedir = $(includedir)/openvswitch openvswitchinclude_HEADERS = \ include/openvswitch/compiler.h \ include/openvswitch/thread.h \ + include/openvswitch/token-bucket.h \ include/openvswitch/types.h \ include/openvswitch/util.h \ include/openvswitch/version.h diff --git a/lib/token-bucket.h b/include/openvswitch/token-bucket.h similarity index 95% rename from lib/token-bucket.h rename to include/openvswitch/token-bucket.h index ef2b1ae75..bbcde84e0 100644 --- a/lib/token-bucket.h +++ b/include/openvswitch/token-bucket.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef TOKEN_BUCKET_H -#define TOKEN_BUCKET_H 1 +#ifndef OPENVSWITCH_TOKEN_BUCKET_H +#define OPENVSWITCH_TOKEN_BUCKET_H 1 #include #include diff --git a/lib/automake.mk b/lib/automake.mk index a98f7cc64..ba5f80aa4 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -245,7 +245,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/tnl-ports.c \ lib/tnl-ports.h \ lib/token-bucket.c \ - lib/token-bucket.h \ lib/type-props.h \ lib/unaligned.h \ lib/unicode.c \ diff --git a/lib/token-bucket.c b/lib/token-bucket.c index 73f11a8c2..23bc6ed3f 100644 --- a/lib/token-bucket.c +++ b/lib/token-bucket.c @@ -16,7 +16,7 @@ #include -#include "token-bucket.h" +#include "openvswitch/token-bucket.h" #include "poll-loop.h" #include "sat-math.h" diff --git a/lib/vlog.h b/lib/vlog.h index d0ada035f..67d37eb9f 100644 --- a/lib/vlog.h +++ b/lib/vlog.h @@ -33,7 +33,7 @@ #include "compiler.h" #include "ovs-thread.h" #include "sat-math.h" -#include "token-bucket.h" +#include "openvswitch/token-bucket.h" #include "util.h" #include "list.h" diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c index 351623da8..d769a5378 100644 --- a/ofproto/pinsched.c +++ b/ofproto/pinsched.c @@ -31,7 +31,7 @@ #include "rconn.h" #include "sat-math.h" #include "timeval.h" -#include "token-bucket.h" +#include "openvswitch/token-bucket.h" #include "vconn.h" struct pinqueue { -- 2.20.1