Contents of /trunk/kdelibs/patches/kdelibs-3.5.10-fix-flock-redefinition.patch
Parent Directory
| 
Revision Log
Revision 794 -
(show annotations)
(download)
Sun May 10 22:43:16 2009 UTC (14 years, 11 months ago) by niro
File size: 563 byte(s)
Sun May 10 22:43:16 2009 UTC (14 years, 11 months ago) by niro
File size: 563 byte(s)
fix compilation with gcc-43
| 1 | diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp |
| 2 | --- kdelibs-3.5.9/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200 |
| 3 | +++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp 2008-08-23 00:59:17.000000000 +0200 |
| 4 | @@ -71,7 +71,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 | { |