[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-3123-g09b629e
Jeremy Allison
jra at samba.org
Thu Oct 30 19:33:12 GMT 2008
The branch, v3-2-test has been updated
via 09b629e2c42315f8d4dcd0106de9ea840ac28721 (commit)
from 680ec1bb2c2e987a40d9d08a14dab6b2e44152a7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 09b629e2c42315f8d4dcd0106de9ea840ac28721
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Oct 30 12:32:06 2008 -0700
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
-----------------------------------------------------------------------
Summary of changes:
source/configure.in | 2 +-
source/smbd/notify_inotify.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index f28da35..5a3abd0 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -2473,7 +2473,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 <asm/unistd.h>])
],
diff --git a/source/smbd/notify_inotify.c b/source/smbd/notify_inotify.c
index c6c12a9..8237e4a 100644
--- a/source/smbd/notify_inotify.c
+++ b/source/smbd/notify_inotify.c
@@ -25,6 +25,10 @@
#ifdef HAVE_INOTIFY
+#if HAVE_SYS_INOTIFY_H
+#include <sys/inotify.h>
+#else
+
#ifdef HAVE_ASM_TYPES_H
#include <asm/types.h>
#endif
@@ -57,7 +61,7 @@ static int inotify_rm_watch(int fd, int wd)
#include <sys/inotify.h>
#endif
-
+#endif
/* older glibc headers don't have these defines either */
#ifndef IN_ONLYDIR
--
Samba Shared Repository
More information about the samba-cvs
mailing list