projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: time redefinition warnings on macOS builds
[lttng-tools.git]
/
src
/
common
/
compat
/
compat-epoll.c
diff --git
a/src/common/compat/compat-epoll.c
b/src/common/compat/compat-epoll.c
index 5d6153b64d075b5da4dc9881680be992e6018b6f..9c2688d33e09c3c774b914b366226424504324e7 100644
(file)
--- a/
src/common/compat/compat-epoll.c
+++ b/
src/common/compat/compat-epoll.c
@@
-15,7
+15,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
#include <fcntl.h>
#define _LGPL_SOURCE
#include <assert.h>
#include <fcntl.h>
@@
-24,7
+23,6
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <config.h>
#include <common/error.h>
#include <common/defaults.h>
#include <common/error.h>
#include <common/defaults.h>
@@
-78,8
+76,9
@@
int compat_epoll_create(struct lttng_poll_event *events, int size, int flags)
}
if (!poll_max_size) {
}
if (!poll_max_size) {
- ERR("poll_max_size not initialized yet");
- goto error;
+ if (lttng_poll_set_max_size()) {
+ goto error;
+ }
}
/* Don't bust the limit here */
}
/* Don't bust the limit here */
@@
-210,7
+209,6
@@
int compat_epoll_wait(struct lttng_poll_event *events, int timeout)
ERR("Wrong arguments in compat_epoll_wait");
goto error;
}
ERR("Wrong arguments in compat_epoll_wait");
goto error;
}
- assert(events->nb_fd >= 0);
if (events->nb_fd == 0) {
errno = EINVAL;
if (events->nb_fd == 0) {
errno = EINVAL;
This page took
0.025539 seconds
and
4
git commands to generate.