common: compile libconfig as C++

[lttng-tools.git] / src / common / compat / poll.h

diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h
index 7dce4e6eb836c34f3337675bbb4bba722734bdd7..75de9ba5fcf0a3ea60cbc086c9c60df3d680f0be 100644 (file)
--- a/src/common/compat/poll.h
+++ b/src/common/compat/poll.h
@@ -8,12 +8,15 @@
 #ifndef _LTT_POLL_H
 #define _LTT_POLL_H
 
-#include <assert.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <common/common.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Used by lttng_poll_clean to free the events structure in a lttng_poll_event.
  */
@@ -22,6 +25,10 @@ static inline void __lttng_poll_free(void *events)
        free(events);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 /*
  * epoll(7) implementation.
  */
@@ -31,6 +38,10 @@ static inline void __lttng_poll_free(void *events)
 #include <features.h>
 #include <common/compat/fcntl.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* See man epoll(7) for this define path */
 #define COMPAT_EPOLL_PROC_PATH "/proc/sys/fs/epoll/max_user_watches"
 
@@ -74,8 +85,8 @@ struct compat_epoll_event {
 static inline int __lttng_epoll_get_prev_fd(struct lttng_poll_event *events,
                int index, uint32_t nb_fd)
 {
-       assert(events);
-       assert(index != nb_fd);
+       LTTNG_ASSERT(events);
+       LTTNG_ASSERT(index != nb_fd);
 
        if (index == 0 || nb_fd == 0) {
                return -1;
@@ -117,7 +128,7 @@ static inline int compat_glibc_epoll_create(int size, int flags)
         * fcntl(..).
         */
        int efd = epoll_create(size);
-       assert(fcntl(efd, F_SETFD, flags) != -1);
+       LTTNG_ASSERT(fcntl(efd, F_SETFD, flags) != -1);
        return efd;
 }
 #endif
@@ -209,6 +220,10 @@ static inline void lttng_poll_clean(struct lttng_poll_event *events)
        __lttng_poll_free((void *) events->events);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #else  /* HAVE_EPOLL */
 /*
  * Fallback on poll(2) API
@@ -227,6 +242,10 @@ static inline void lttng_poll_clean(struct lttng_poll_event *events)
 #include <poll.h>
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum {
        /* Polling variables compatibility for poll */
        LPOLLIN = POLLIN,
@@ -279,8 +298,8 @@ struct compat_poll_event {
 static inline int __lttng_poll_get_prev_fd(struct lttng_poll_event *events,
                int index, uint32_t nb_fd)
 {
-       assert(events);
-       assert(index != nb_fd);
+       LTTNG_ASSERT(events);
+       LTTNG_ASSERT(index != nb_fd);
 
        if (index == 0 || nb_fd == 0) {
                return -1;
@@ -378,6 +397,10 @@ static inline void lttng_poll_clean(struct lttng_poll_event *events)
        }
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* HAVE_EPOLL */
 
 #endif /* _LTT_POLL_H */