From 0b169925aa9f606dc96fbffc069d76e0ffa45c29 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Mon, 20 Aug 2018 19:04:20 +0200 Subject: [PATCH] Prep v239: Unmask inotify event stuff, now ustilized by the sd_event struct. --- src/basic/fs-util.h | 4 ++-- src/libelogind/sd-event/sd-event.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index 98be9ba07..940853f42 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -64,7 +64,6 @@ int var_tmp_dir(const char **ret); int unlink_or_warn(const char *filename); -#if 0 /// UNNEEDED by elogind #define INOTIFY_EVENT_MAX (sizeof(struct inotify_event) + NAME_MAX + 1) #define FOREACH_INOTIFY_EVENT(e, buffer, sz) \ @@ -77,9 +76,10 @@ union inotify_event_buffer { uint8_t raw[INOTIFY_EVENT_MAX]; }; +#if 0 /// UNNEEDED by elogind int inotify_add_watch_fd(int fd, int what, uint32_t mask); - #endif // 0 + enum { CHASE_PREFIX_ROOT = 1 << 0, /* If set, the specified path will be prefixed by the specified root before beginning the iteration */ CHASE_NONEXISTENT = 1 << 1, /* If set, it's OK if the path doesn't actually exist. */ diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c index eb5d3effe..d53b9a702 100644 --- a/src/libelogind/sd-event/sd-event.c +++ b/src/libelogind/sd-event/sd-event.c @@ -12,7 +12,7 @@ #include "alloc-util.h" #include "fd-util.h" -//#include "fs-util.h" +#include "fs-util.h" #include "hashmap.h" #include "list.h" #include "macro.h" -- 2.30.2