rpms/kdelibs3/devel kdelibs-3.5.9-fix-flock-redefinition.patch, 1.1, 1.2

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14258/devel

Modified Files:
	kdelibs-3.5.9-fix-flock-redefinition.patch 
Log Message:
Oops, that didn't work, try a different workaround.

kdelibs-3.5.9-fix-flock-redefinition.patch:

Index: kdelibs-3.5.9-fix-flock-redefinition.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs-3.5.9-fix-flock-redefinition.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-3.5.9-fix-flock-redefinition.patch	22 Aug 2008 22:40:19 -0000	1.1
+++ kdelibs-3.5.9-fix-flock-redefinition.patch	22 Aug 2008 23:00:15 -0000	1.2
@@ -1,11 +1,15 @@
 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
-+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp	2008-08-23 00:36:02.000000000 +0200
-@@ -71,6 +71,7 @@
++++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp	2008-08-23 00:59:17.000000000 +0200
+@@ -71,7 +71,11 @@
  #include <linux/types.h>
  // Linux kernel headers are documented to not compile
  #define _S390_BITOPS_H
-+#define _ASM_GENERIC_FCNTL_H
++#define flock linux_flock
++#define flock64 linux_flock64
  #include <linux/inotify.h>
++#undef flock
++#undef flock64
  
  static inline int inotify_init (void)
+ {