Merge "master" into "next".

[cascardo/ovs.git] / lib / poll-loop.h

diff --git a/lib/poll-loop.h b/lib/poll-loop.h
index 89c8e57..adb88d4 100644 (file)
--- a/lib/poll-loop.h
+++ b/lib/poll-loop.h
@@ -34,6 +34,10 @@
 
 #include <poll.h>
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 struct poll_waiter;
 
 /* Schedule events to wake up the following poll_block(). */
@@ -47,4 +51,8 @@ void poll_block(void);
 /* Cancel a file descriptor callback or event. */
 void poll_cancel(struct poll_waiter *);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* poll-loop.h */