diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-30 23:29:14 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-30 23:29:14 +0100 |
| commit | 6acd90998803c28fa12ff0d1f47056c64b7d8d8d (patch) | |
| tree | 11d0df3327f71e02cecafd79ec98af0fd2409438 /source3/smbd | |
| parent | 0ab0373a97114b2911ed5f38e3548676f196a2c0 (diff) | |
| parent | 782f309df35cba41c9e5b65db242b961bacbbf87 (diff) | |
| download | samba-6acd90998803c28fa12ff0d1f47056c64b7d8d8d.tar.gz samba-6acd90998803c28fa12ff0d1f47056c64b7d8d8d.tar.bz2 samba-6acd90998803c28fa12ff0d1f47056c64b7d8d8d.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/notify_inotify.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 <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 |