diff options
| author | Colin Walters <walters@verbum.org> | 2010-03-16 16:04:15 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-03-16 16:11:14 -0400 |
| commit | ebfa7c02fd67777684d39389e25346819836dcca (patch) | |
| tree | 93c2b9876ce960cbf2fa27dad9fb017184b7610b /bus/dir-watch-inotify.c | |
| parent | acbc751e28446696fee92c236cfef176786409d5 (diff) | |
| parent | ce34415302af586ea6ca9b0da4b21a7025041ef7 (diff) | |
| download | dbus-ebfa7c02fd67777684d39389e25346819836dcca.tar.gz | |
Merge branch 'dbus-1.2'
Conflicts:
bus/bus.c
configure.in
Diffstat (limited to 'bus/dir-watch-inotify.c')
| -rw-r--r-- | bus/dir-watch-inotify.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c index 8b70a416..39eff974 100644 --- a/bus/dir-watch-inotify.c +++ b/bus/dir-watch-inotify.c @@ -225,6 +225,11 @@ _init_inotify (BusContext *context) { #ifdef HAVE_INOTIFY_INIT1 inotify_fd = inotify_init1 (IN_CLOEXEC); + /* This ensures we still run on older Linux kernels. + * https://bugs.freedesktop.org/show_bug.cgi?id=23957 + */ + if (inotify_fd < 0) + inotify_fd = inotify_init (); #else inotify_fd = inotify_init (); #endif |