Signed-off-by: Ben Pfaff <b...@nicira.com> --- lib/learn.c | 4 +++- lib/ofp-util.c | 14 ++------------ lib/ofp-util.h | 5 +---- 3 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/lib/learn.c b/lib/learn.c index ab403be..1ccdfb3 100644 --- a/lib/learn.c +++ b/lib/learn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012 Nicira, Inc. + * Copyright (c) 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,8 @@ #include "learn.h" +#include <stdlib.h> + #include "byte-order.h" #include "dynamic-string.h" #include "match.h" diff --git a/lib/ofp-util.c b/lib/ofp-util.c index b4ff09b..159deb0 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -15,32 +15,22 @@ */ #include <config.h> -#include "ofp-print.h" +#include "ofp-util.h" #include <ctype.h> #include <errno.h> #include <inttypes.h> #include <sys/types.h> -#include <netinet/in.h> #include <netinet/icmp6.h> -#include <stdlib.h> -#include "bundle.h" #include "byte-order.h" -#include "classifier.h" #include "dynamic-string.h" -#include "learn.h" -#include "meta-flow.h" -#include "multipath.h" #include "netdev.h" #include "nx-match.h" #include "ofp-actions.h" #include "ofp-errors.h" #include "ofp-msgs.h" -#include "ofp-util.h" #include "ofpbuf.h" -#include "packets.h" -#include "random.h" -#include "unaligned.h" #include "type-props.h" +#include "unaligned.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(ofp_util); diff --git a/lib/ofp-util.h b/lib/ofp-util.h index 4d0d8ad..76409c5 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -18,16 +18,13 @@ #define OFP_UTIL_H 1 #include <stdbool.h> -#include <stddef.h> #include <stdint.h> -#include "classifier.h" -#include "compiler.h" #include "flow.h" #include "match.h" #include "netdev.h" -#include "openflow/nicira-ext.h" #include "openvswitch/types.h" +struct list; struct ofpbuf; /* Port numbers. */ -- 1.7.10.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
