Signed-off-by: Ben Pfaff <[email protected]>
---
lib/entropy.c | 4 +++-
lib/leak-checker.c | 3 ++-
lib/stream-provider.h | 1 +
lib/vlog.c | 2 --
lib/vlog.h | 2 --
vswitchd/xenserver.c | 3 ++-
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/entropy.c b/lib/entropy.c
index c1f0886..399c0c8 100644
--- a/lib/entropy.c
+++ b/lib/entropy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
+/* Copyright (c) 2008, 2009, 2010, 2011, 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.
@@ -19,9 +19,11 @@
#include <errno.h>
#include <fcntl.h>
+#include <string.h>
#include <unistd.h>
#include "socket-util.h"
+#include "util.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(entropy);
diff --git a/lib/leak-checker.c b/lib/leak-checker.c
index 1fd3d5b..8727769 100644
--- a/lib/leak-checker.c
+++ b/lib/leak-checker.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, 2010 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 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.
@@ -17,6 +17,7 @@
#include <config.h>
#include "leak-checker.h"
#include <inttypes.h>
+#include <string.h>
#include "backtrace.h"
#include "vlog.h"
diff --git a/lib/stream-provider.h b/lib/stream-provider.h
index 43c63e8..302b0b9 100644
--- a/lib/stream-provider.h
+++ b/lib/stream-provider.h
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include "stream.h"
+#include "util.h"
/* Active stream connection. */
diff --git a/lib/vlog.c b/lib/vlog.c
index 193e4f7..fca932d 100644
--- a/lib/vlog.c
+++ b/lib/vlog.c
@@ -26,13 +26,11 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <syslog.h>
-#include <time.h>
#include <unistd.h>
#include "coverage.h"
#include "dirs.h"
#include "dynamic-string.h"
#include "ofpbuf.h"
-#include "sat-math.h"
#include "svec.h"
#include "timeval.h"
#include "unixctl.h"
diff --git a/lib/vlog.h b/lib/vlog.h
index c7ab206..bec03ba 100644
--- a/lib/vlog.h
+++ b/lib/vlog.h
@@ -17,14 +17,12 @@
#ifndef VLOG_H
#define VLOG_H 1
-#include <limits.h>
#include <stdarg.h>
#include <stdbool.h>
#include <time.h>
#include "compiler.h"
#include "sat-math.h"
#include "token-bucket.h"
-#include "util.h"
#ifdef __cplusplus
extern "C" {
diff --git a/vswitchd/xenserver.c b/vswitchd/xenserver.c
index 7427e4c..1c166bd 100644
--- a/vswitchd/xenserver.c
+++ b/vswitchd/xenserver.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010 Nicira, Inc.
+/* Copyright (c) 2009, 2010, 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.
@@ -22,6 +22,7 @@
#include <unistd.h>
#include "dynamic-string.h"
#include "process.h"
+#include "util.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(xenserver);
--
1.7.10.4
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
