a7044c9
diff -up kdelibs-3.5.10/kio/kio/kdirwatch.cpp.flock-redefinition kdelibs-3.5.10/kio/kio/kdirwatch.cpp
a7044c9
--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp.flock-redefinition	2006-07-22 08:16:37.000000000 +0000
a7044c9
+++ kdelibs-3.5.10/kio/kio/kdirwatch.cpp	2011-05-11 14:48:07.000000000 +0000
a7044c9
@@ -67,26 +67,7 @@
a7044c9
 #ifdef HAVE_INOTIFY
a7044c9
 #include <unistd.h>
a7044c9
 #include <fcntl.h>
a7044c9
-#include <sys/syscall.h>
a7044c9
-#include <linux/types.h>
a7044c9
-// Linux kernel headers are documented to not compile
a7044c9
-#define _S390_BITOPS_H
a7044c9
-#include <linux/inotify.h>
a7044c9
-
a7044c9
-static inline int inotify_init (void)
a7044c9
-{
a7044c9
-  return syscall (__NR_inotify_init);
a7044c9
-}
a7044c9
-
a7044c9
-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
a7044c9
-{
a7044c9
-  return syscall (__NR_inotify_add_watch, fd, name, mask);
a7044c9
-}
a7044c9
-
a7044c9
-static inline int inotify_rm_watch (int fd, __u32 wd)
a7044c9
-{
a7044c9
-  return syscall (__NR_inotify_rm_watch, fd, wd);
a7044c9
-}
a7044c9
+#include <sys/inotify.h>
a7044c9
 
a7044c9
 #ifndef  IN_ONLYDIR
a7044c9
 #define  IN_ONLYDIR 0x01000000