diff options
| author | Volker Lendecke <vl@samba.org> | 2008-02-25 12:52:55 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-02-25 12:58:56 +0100 |
| commit | 43491db17c8f0b62f5bfdcb68a92feef651ed5d4 (patch) | |
| tree | 16ed81c59f073997c23744c47d8e0497cd9bba99 | |
| parent | 1f635e3888d51641a414f84f7402f249de287a74 (diff) | |
| download | samba-43491db17c8f0b62f5bfdcb68a92feef651ed5d4.tar.gz samba-43491db17c8f0b62f5bfdcb68a92feef651ed5d4.tar.bz2 samba-43491db17c8f0b62f5bfdcb68a92feef651ed5d4.zip | |
Fix inotify detection
Bug 5271 -- thanks to Tiziano Müller
(This used to be commit 4a1a138b0fe0f2200e5a37a0609481e4340a896c)
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/smbd/notify_inotify.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 3ab2166095..1c326a8ea2 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2362,7 +2362,7 @@ fi AC_CACHE_CHECK([for inotify support],samba_cv_HAVE_INOTIFY,[ AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h) -AC_CHECK_FUNC(inotify_init) +AC_CHECK_FUNCS(inotify_init) AC_HAVE_DECL(__NR_inotify_init, [#include <asm/unistd.h>]) ], samba_cv_HAVE_INOTIFY=yes, diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c index 73cee440d4..fa0f0ed51d 100644 --- a/source3/smbd/notify_inotify.c +++ b/source3/smbd/notify_inotify.c @@ -29,10 +29,12 @@ #include <asm/types.h> #endif +#ifndef HAVE_INOTIFY_INIT + #include <linux/inotify.h> #include <asm/unistd.h> -#ifndef HAVE_INOTIFY_INIT + /* glibc doesn't define these functions yet (as of March 2006) */ @@ -50,6 +52,10 @@ static int inotify_rm_watch(int fd, int wd) { return syscall(__NR_inotify_rm_watch, fd, wd); } +#else + +#include <sys/inotify.h> + #endif |