projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: sessiond: cmd_enable_channel_internal
[lttng-tools.git]
/
src
/
common
/
compat
/
poll.h
diff --git
a/src/common/compat/poll.h
b/src/common/compat/poll.h
index 75de9ba5fcf0a3ea60cbc086c9c60df3d680f0be..cc2aab8f8fa50abde12b95763a23d60d89efb264 100644
(file)
--- 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>
#include <common/common.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/*
* Used by lttng_poll_clean to free the events structure in a lttng_poll_event.
*/
/*
* 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);
}
free(events);
}
-#ifdef __cplusplus
-}
-#endif
-
/*
* epoll(7) implementation.
*/
/*
* epoll(7) implementation.
*/
@@
-38,10
+30,6
@@
static inline void __lttng_poll_free(void *events)
#include <features.h>
#include <common/compat/fcntl.h>
#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"
/* 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);
}
__lttng_poll_free((void *) events->events);
}
-#ifdef __cplusplus
-}
-#endif
-
#else /* HAVE_EPOLL */
/*
* Fallback on poll(2) API
#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>
#include <poll.h>
#include <stdint.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
enum {
/* Polling variables compatibility for poll */
LPOLLIN = POLLIN,
enum {
/* Polling variables compatibility for poll */
LPOLLIN = POLLIN,
@@
-255,7
+235,7
@@
enum {
LPOLLRDBAND = POLLRDBAND,
LPOLLWRNORM = POLLWRNORM,
LPOLLWRBAND = POLLWRBAND,
LPOLLRDBAND = POLLRDBAND,
LPOLLWRNORM = POLLWRNORM,
LPOLLWRBAND = POLLWRBAND,
-#if __linux__
+#if
def
__linux__
LPOLLMSG = POLLMSG,
LPOLLRDHUP = POLLRDHUP,
#elif (defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
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)
*/
/*
* 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 */
#endif /* HAVE_EPOLL */
#endif /* _LTT_POLL_H */
This page took
0.025191 seconds
and
4
git commands to generate.