lib: Move token-bucket.h to <openvswitch/token-bucket.h>

Signed-off-by: Thomas Graf <[email protected]> Acked-by: Ben Pfaff <[email protected]>
dhanunjaya · Dec 15, 2014 · d668c4a · d668c4a
1 parent 904e080
commit d668c4a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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 → include/openvswitch/token-bucket.h b/lib/token-bucket.h → 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 <limits.h>
 #include <stdbool.h>

diff --git 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
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#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
@@ -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
@@ -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 {