[SCM] Samba Shared Repository - branch master updated - a9fed0955c5e332120fc6f778065551f7dd7ea86

[Jeremy Allison]

The branch, master has been updated
       via  a9fed0955c5e332120fc6f778065551f7dd7ea86 (commit)
      from  2fce8d83c4f58c9f2214777a3583955682445eff (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a9fed0955c5e332120fc6f778065551f7dd7ea86
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Oct 30 12:30:04 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:
 source3/configure.in          |    2 +-
 source3/smbd/notify_inotify.c |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index a37e97c..a59fe32 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 <asm/unistd.h>])
 ],
diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index c6c12a9..8237e4a 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 <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