Merge "master" into "next".

[openvswitch] / lib / timeval.h

diff --git a/lib/timeval.h b/lib/timeval.h
index 5ba903e3a4dadd722c3d4f1dbb2192355361330b..89abe803635340f3b3e1c31beacd14967a1385ce 100644 (file)
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,10 @@
 #include "type-props.h"
 #include "util.h"
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 struct pollfd;
 struct timeval;
 
@@ -53,4 +57,8 @@ int time_poll(struct pollfd *, int n_pollfds, int timeout);
 
 long long int timeval_to_msec(const struct timeval *);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* timeval.h */