From a9fed0955c5e332120fc6f778065551f7dd7ea86 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 30 Oct 2008 12:30:04 -0700 Subject: use glibc sys/inotify.h header when we first added the inotify code glibc didn't have the inotify functions yet. Now that it does we can use the official header and avoid the asm/unistd.h syscall workaround --- source3/configure.in | 2 +- source3/smbd/notify_inotify.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/configure.in b/source3/configure.in index a37e97c9da..a59fe32aff 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2489,7 +2489,7 @@ if test x"$samba_cv_HAVE_KERNEL_CHANGE_NOTIFY" = x"yes"; then fi AC_CACHE_CHECK([for inotify support],samba_cv_HAVE_INOTIFY,[ -AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h) +AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h sys/inotify.h) AC_CHECK_FUNCS(inotify_init) AC_HAVE_DECL(__NR_inotify_init, [#include ]) ], diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c index c6c12a9cd2..8237e4ab0b 100644 --- a/source3/smbd/notify_inotify.c +++ b/source3/smbd/notify_inotify.c @@ -25,6 +25,10 @@ #ifdef HAVE_INOTIFY +#if HAVE_SYS_INOTIFY_H +#include +#else + #ifdef HAVE_ASM_TYPES_H #include #endif @@ -57,7 +61,7 @@ static int inotify_rm_watch(int fd, int wd) #include #endif - +#endif /* older glibc headers don't have these defines either */ #ifndef IN_ONLYDIR -- cgit