Merge "next" branch into "master".

diff --git a/lib/svec.h b/lib/svec.h
index 2a93139..d9bb8a7 100644 (file)
--- a/lib/svec.h
+++ b/lib/svec.h
@@ -19,6 +19,10 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+ 
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 struct svec {
     char **names;
@@ -67,5 +71,9 @@ void svec_pop_back(struct svec *);
           ? (NAME) = (SVEC)->names[INDEX], 1    \
           : 0);                                 \
          (INDEX)++)
+ 
+#ifdef  __cplusplus
+}
+#endif
 
 #endif /* svec.h */

diff --git a/lib/unixctl.h b/lib/unixctl.h
index 0b6cbf3..89199bb 100644 (file)
--- a/lib/unixctl.h
+++ b/lib/unixctl.h
@@ -16,6 +16,10 @@
 
 #ifndef UNIXCTL_H
 #define UNIXCTL_H 1
+ 
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 /* Server for Unix domain socket control connection. */
 struct unixctl_server;
@@ -41,5 +45,9 @@ void unixctl_command_register(const char *name,
                               unixctl_cb_func *cb, void *aux);
 void unixctl_command_reply(struct unixctl_conn *, int code,
                            const char *body);
+ 
+#ifdef  __cplusplus
+}
+#endif
 
 #endif /* unixctl.h */

diff --git a/lib/vlog.h b/lib/vlog.h
index d98855a..f50b76a 100644 (file)
--- a/lib/vlog.h
+++ b/lib/vlog.h
@@ -22,6 +22,10 @@
 #include <stdbool.h>
 #include <time.h>
 #include "util.h"
+ 
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 /* Logging importance levels. */
 #define VLOG_LEVELS                             \
@@ -187,6 +191,10 @@ void vlog_usage(void);
         }                                                           \
     } while (0)
 extern enum vlog_level min_vlog_levels[VLM_N_MODULES];
+ 
+#ifdef  __cplusplus
+}
+#endif
 
 
 #endif /* vlog.h */