jreznik pushed to kdelibs3 (epel7). "Oops, that didn't work, try a different workaround."

[notifications at fedoraproject.org]

>From 219ceafafb0e1def0b316e30d3d3177e17111004 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler at fedoraproject.org>
Date: Fri, 22 Aug 2008 23:00:15 +0000
Subject: Oops, that didn't work, try a different workaround.


diff --git a/kdelibs-3.5.9-fix-flock-redefinition.patch b/kdelibs-3.5.9-fix-flock-redefinition.patch
index 1934424..b1b1830 100644
--- a/kdelibs-3.5.9-fix-flock-redefinition.patch
+++ b/kdelibs-3.5.9-fix-flock-redefinition.patch
@@ -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)
+ {
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=219ceafafb0e1def0b316e30d3d3177e17111004