From 9f2680d40c5b86077ecbbd506cc0e129db6a1c33 Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Wed, 10 Nov 2004 13:23:08 +0000
Subject: [PATCH] Stefan Fiedler: 	valgrind: modify linux-2.6.9.patch for
 builds with linux24-header

Index: package/rene/valgrind/linux-2.6.9.patch
===================================================================

[2004110315101629940] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4773 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/rene/valgrind/linux-2.6.9.patch | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/package/rene/valgrind/linux-2.6.9.patch b/package/rene/valgrind/linux-2.6.9.patch
index 674244595..0c91ff93b 100644
--- a/package/rene/valgrind/linux-2.6.9.patch
+++ b/package/rene/valgrind/linux-2.6.9.patch
@@ -1,10 +1,10 @@
---- valgrind-2.2.0/coregrind/vg_unsafe.h	2004-08-29 21:02:28.000000000 +0000
-+++ valgrind-2.2.0-p/coregrind/vg_unsafe.h	2004-10-24 08:47:50.959307152 +0000
-@@ -47,7 +47,14 @@
+diff -dur valgrind-2.2.0/coregrind/vg_unsafe.h valgrind-2.2.0-p/coregrind/vg_unsafe.h
+--- valgrind-2.2.0/coregrind/vg_unsafe.h	2004-11-02 22:03:17.000000000 +0100
++++ valgrind-2.2.0-p/coregrind/vg_unsafe.h	2004-11-02 20:49:06.000000000 +0100
+@@ -47,7 +47,17 @@
  #include <sys/socket.h>   /* for struct msghdr */
  #include <linux/sockios.h>/* for SIOCOUTQ */
  #include <sys/un.h>       /* for sockaddr_un */
--#include <net/if.h>       /* for struct ifreq et al */
 +
 +/* for linux-2.6.9, from linux/types.h */
 +#  include <asm/types.h>
@@ -12,7 +12,10 @@
 +#  define pgoff_t unsigned long
 +#  endif
 +
-+/* #include <net/if.h> */ /* for struct ifreq et al */
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
+ #include <net/if.h>       /* for struct ifreq et al */
++#endif
  #include <net/if_arp.h>   /* for struct arpreq */
  #include <net/route.h>    /* for struct rtentry */
  #ifdef HAVE_LINUX_COMPILER_H