diff -Naur kdepim-3.5.10/kmail/editorwatcher.cpp kdepim-3.5.10-magellan/kmail/editorwatcher.cpp
--- kdepim-3.5.10/kmail/editorwatcher.cpp	2008-02-13 10:39:37.000000000 +0100
+++ kdepim-3.5.10-magellan/kmail/editorwatcher.cpp	2009-05-12 23:08:25.000000000 +0200
@@ -40,7 +40,11 @@
 #include <linux/types.h>
 // Linux kernel headers are documented to not compile
 #define _S390_BITOPS_H
+#define flock linux_flock
+#define flock64 linux_flock64
 #include <linux/inotify.h>
+#undef flock
+#undef flock64
 
 static inline int inotify_init (void)
 {