diff options
| author | Adrian Bunk <bunk@stusta.de> | 2012-04-09 21:16:12 +0300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-04-13 21:15:00 +0200 |
| commit | 55cbf7ba340d91c473f57fe8e5deb8d082131b0a (patch) | |
| tree | 7a2908a55bea62b7e78192ba212b759b3a7d6c57 /source3/smbd | |
| parent | 1a8405c320f115d584a9094bf5878b8cf6d58893 (diff) | |
| download | samba-55cbf7ba340d91c473f57fe8e5deb8d082131b0a.tar.gz samba-55cbf7ba340d91c473f57fe8e5deb8d082131b0a.tar.bz2 samba-55cbf7ba340d91c473f57fe8e5deb8d082131b0a.zip | |
rely on sys/inotify.h for inotify
sys/inotify.h was added to glibc 2.4 in 2006.
Signed-off-by: Jeremy Allison <jra@samba.org>
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Apr 13 21:15:00 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/notify_inotify.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c index 20f709831a..7f463a156f 100644 --- a/source3/smbd/notify_inotify.c +++ b/source3/smbd/notify_inotify.c @@ -27,45 +27,9 @@ #ifdef HAVE_INOTIFY -#if HAVE_SYS_INOTIFY_H #include <sys/inotify.h> -#else -#ifdef HAVE_ASM_TYPES_H -#include <asm/types.h> -#endif - -#ifndef HAVE_INOTIFY_INIT - -#include <linux/inotify.h> -#include <asm/unistd.h> - - -/* - glibc doesn't define these functions yet (as of March 2006) -*/ -static int inotify_init(void) -{ - return syscall(__NR_inotify_init); -} - -static int inotify_add_watch(int fd, const char *path, __u32 mask) -{ - return syscall(__NR_inotify_add_watch, fd, path, mask); -} - -static int inotify_rm_watch(int fd, int wd) -{ - return syscall(__NR_inotify_rm_watch, fd, wd); -} -#else - -#include <sys/inotify.h> - -#endif -#endif - -/* older glibc headers don't have these defines either */ +/* glibc < 2.5 headers don't have these defines */ #ifndef IN_ONLYDIR #define IN_ONLYDIR 0x01000000 #endif |