Annotation of /trunk/kdepim/patches/kdepim-3.5.10-fix-flock-redefinition.patch
Parent Directory | Revision Log
Revision 807 -
(hide annotations)
(download)
Tue May 12 20:28:57 2009 UTC (15 years, 4 months ago) by niro
File size: 545 byte(s)
Tue May 12 20:28:57 2009 UTC (15 years, 4 months ago) by niro
File size: 545 byte(s)
fix build with newer linux-headers
1 | niro | 807 | diff -Naur kdepim-3.5.10/kmail/editorwatcher.cpp kdepim-3.5.10-magellan/kmail/editorwatcher.cpp |
2 | --- kdepim-3.5.10/kmail/editorwatcher.cpp 2008-02-13 10:39:37.000000000 +0100 | ||
3 | +++ kdepim-3.5.10-magellan/kmail/editorwatcher.cpp 2009-05-12 23:08:25.000000000 +0200 | ||
4 | @@ -40,7 +40,11 @@ | ||
5 | #include <linux/types.h> | ||
6 | // Linux kernel headers are documented to not compile | ||
7 | #define _S390_BITOPS_H | ||
8 | +#define flock linux_flock | ||
9 | +#define flock64 linux_flock64 | ||
10 | #include <linux/inotify.h> | ||
11 | +#undef flock | ||
12 | +#undef flock64 | ||
13 | |||
14 | static inline int inotify_init (void) | ||
15 | { |