2008-08-22 22:40:19 +00:00
|
|
|
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
|
|
|
|
|
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
|
2008-08-22 23:00:15 +00:00
|
|
|
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp 2008-08-23 00:59:17.000000000 +0200
|
|
|
|
|
@@ -71,7 +71,11 @@
|
2008-08-22 22:40:19 +00:00
|
|
|
#include <linux/types.h>
|
|
|
|
|
// Linux kernel headers are documented to not compile
|
|
|
|
|
#define _S390_BITOPS_H
|
2008-08-22 23:00:15 +00:00
|
|
|
+#define flock linux_flock
|
|
|
|
|
+#define flock64 linux_flock64
|
2008-08-22 22:40:19 +00:00
|
|
|
#include <linux/inotify.h>
|
2008-08-22 23:00:15 +00:00
|
|
|
+#undef flock
|
|
|
|
|
+#undef flock64
|
2008-08-22 22:40:19 +00:00
|
|
|
|
|
|
|
|
static inline int inotify_init (void)
|
2008-08-22 23:00:15 +00:00
|
|
|
{
|
