Merge "master" into "next".

[cascardo/ovs.git] / lib / netdev.h

diff --git a/lib/netdev.h b/lib/netdev.h
index e3a3176..27eb82e 100644 (file)
--- a/lib/netdev.h
+++ b/lib/netdev.h
@@ -21,6 +21,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* Generic interface to network devices.
  *
  * Currently, there is a single implementation of this interface that supports
@@ -155,4 +159,8 @@ void netdev_monitor_remove(struct netdev_monitor *, struct netdev *);
 int netdev_monitor_poll(struct netdev_monitor *, char **devnamep);
 void netdev_monitor_poll_wait(const struct netdev_monitor *);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* netdev.h */