X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fpoll.h;h=cc2aab8f8fa50abde12b95763a23d60d89efb264;hb=4eac90eb7d8428fc6c5a75d3f0e795844fb6c574;hp=75de9ba5fcf0a3ea60cbc086c9c60df3d680f0be;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720;p=lttng-tools.git

diff --git a/src/common/compat/poll.h b/src/common/compat/poll.h
index 75de9ba5f..cc2aab8f8 100644
--- a/src/common/compat/poll.h
+++ b/src/common/compat/poll.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  *
- * SPDX-License-Identifier: GPL-2.0-only
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  */
 
@@ -13,10 +13,6 @@
 
 #include <common/common.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Used by lttng_poll_clean to free the events structure in a lttng_poll_event.
  */
@@ -25,10 +21,6 @@ static inline void __lttng_poll_free(void *events)
 	free(events);
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 /*
  * epoll(7) implementation.
  */
@@ -38,10 +30,6 @@ 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"
 
@@ -220,10 +208,6 @@ 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
@@ -242,10 +226,6 @@ 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,
@@ -255,7 +235,7 @@ enum {
 	LPOLLRDBAND = POLLRDBAND,
 	LPOLLWRNORM = POLLWRNORM,
 	LPOLLWRBAND = POLLWRBAND,
-#if __linux__
+#ifdef __linux__
 	LPOLLMSG = POLLMSG,
 	LPOLLRDHUP = POLLRDHUP,
 #elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
@@ -374,7 +354,8 @@ extern int compat_poll_set_max_size(void);
 /*
  * No need to reset a pollfd structure for poll(2)
  */
-static inline void lttng_poll_reset(struct lttng_poll_event *events)
+static inline void lttng_poll_reset(
+		struct lttng_poll_event *events __attribute__((unused)))
 {}
 
 /*
@@ -397,10 +378,6 @@ static inline void lttng_poll_clean(struct lttng_poll_event *events)
 	}
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* HAVE_EPOLL */
 
 #endif /* _LTT_POLL_H */