From 3021ea6074bcc5a5bc7f1434ade97d84759e8d14 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 3 Oct 2011 21:52:39 -0700 Subject: [PATCH] vconn: Remove unnecessary forward declarations and #includes from header. This required fix-ups in a few other files that accidentally depended upon vconn.h including those other headers. --- lib/vconn.h | 10 +--------- ofproto/pinsched.c | 1 + tests/test-vconn.c | 1 + vswitchd/ovs-vswitchd.c | 1 + 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/vconn.h b/lib/vconn.h index 3c1ffe9c..74b6b49c 100644 --- a/lib/vconn.h +++ b/lib/vconn.h @@ -17,12 +17,8 @@ #ifndef VCONN_H #define VCONN_H 1 -#include #include -#include -#include - -#include "flow.h" +#include "openvswitch/types.h" #ifdef __cplusplus extern "C" { @@ -30,10 +26,6 @@ extern "C" { struct list; struct ofpbuf; -struct ofp_action_header; -struct ofp_header; -struct ofp_match; -struct ofp_stats_msg; struct pvconn; struct vconn; diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c index 695d9b46..6d7eb130 100644 --- a/ofproto/pinsched.c +++ b/ofproto/pinsched.c @@ -21,6 +21,7 @@ #include #include #include +#include "hash.h" #include "hmap.h" #include "ofpbuf.h" #include "openflow/openflow.h" diff --git a/tests/test-vconn.c b/tests/test-vconn.c index 2b14fa85..42940c30 100644 --- a/tests/test-vconn.c +++ b/tests/test-vconn.c @@ -22,6 +22,7 @@ #include #include #include "command-line.h" +#include "openflow/openflow.h" #include "poll-loop.h" #include "socket-util.h" #include "stream.h" diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 4910d699..359e3ab1 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -34,6 +34,7 @@ #include "dummy.h" #include "leak-checker.h" #include "netdev.h" +#include "openflow/openflow.h" #include "ovsdb-idl.h" #include "poll-loop.h" #include "process.h" -- 2.30.2