summaryrefslogtreecommitdiffstats
path: root/kmail/editorwatcher.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-12-16 01:50:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-12-16 01:50:36 +0000
commitd4b702756e673463c9fc008bc6e5931aac6a9011 (patch)
tree56d925d93b2b1468fdcf6b55fbdd5bad008f74c6 /kmail/editorwatcher.cpp
parent460c52653ab0dcca6f19a4f492ed2c5e4e963ab0 (diff)
downloadtdepim-d4b702756e673463c9fc008bc6e5931aac6a9011.tar.gz
tdepim-d4b702756e673463c9fc008bc6e5931aac6a9011.zip
* gcc4.4 compilation fixes
* kmail crash issues resolved * automake updates git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1062791 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/editorwatcher.cpp')
-rw-r--r--kmail/editorwatcher.cpp18
1 files changed, 1 insertions, 17 deletions
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index 9e1bb150f..e9fec6608 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -39,27 +39,11 @@
#elif HAVE_INOTIFY
#include <sys/ioctl.h>
#include <unistd.h>
-#include <fcntl.h>
+#include <sys/inotify.h>
#include <sys/syscall.h>
#include <linux/types.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
-#include <linux/inotify.h>
-
-static inline int inotify_init (void)
-{
- return syscall (__NR_inotify_init);
-}
-
-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
-{
- return syscall (__NR_inotify_add_watch, fd, name, mask);
-}
-
-static inline int inotify_rm_watch (int fd, __u32 wd)
-{
- return syscall (__NR_inotify_rm_watch, fd, wd);
-}
#endif
using namespace KMail;