[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2516-g4a1a138

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  4a1a138b0fe0f2200e5a37a0609481e4340a896c (commit)
      from  9b761062df80c45bf2b76af071131d0c78e94a09 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 4a1a138b0fe0f2200e5a37a0609481e4340a896c
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Feb 25 12:52:55 2008 +0100

    Fix inotify detection
    
    Bug 5271 -- thanks to Tiziano Müller

-----------------------------------------------------------------------

Summary of changes:
 source/configure.in          |    2 +-
 source/smbd/notify_inotify.c |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index 3ab2166..1c326a8 100644
--- a/source/configure.in
+++ b/source/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/source/smbd/notify_inotify.c b/source/smbd/notify_inotify.c
index 73cee44..fa0f0ed 100644
--- a/source/smbd/notify_inotify.c
+++ b/source/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
 
 


-- 
Samba Shared Repository