diff options
| author | rumble <rumble> | 2007-12-18 17:03:35 +0000 |
|---|---|---|
| committer | rumble <rumble> | 2007-12-18 17:03:35 +0000 |
| commit | 094d56bea07f40e943e23db97471b078deee4fe6 (patch) | |
| tree | 0ba02cd053bc1cfa732f23de62681ceec4f04bde /sysutils/radeontool/patches/patch-aa | |
| parent | c949c2add2d53269b59719021f592875333c545f (diff) | |
| download | pkgsrc-094d56bea07f40e943e23db97471b078deee4fe6.tar.gz | |
On NetBSD-current (approximately >= 4.99.32) <sys/vmparam.h> requires
<sys/mutex.h> rather than <sys/lock.h>. Conditionally include the
appropriate file so this compiles again.
Diffstat (limited to 'sysutils/radeontool/patches/patch-aa')
| -rw-r--r-- | sysutils/radeontool/patches/patch-aa | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sysutils/radeontool/patches/patch-aa b/sysutils/radeontool/patches/patch-aa index d536873f1c6..31ed03d497c 100644 --- a/sysutils/radeontool/patches/patch-aa +++ b/sysutils/radeontool/patches/patch-aa @@ -1,20 +1,25 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/01/24 15:07:35 jmcneill Exp $ ---- radeontool.c.orig 2005-01-24 10:39:22.000000000 -0400 -+++ radeontool.c 2005-01-24 10:41:49.000000000 -0400 -@@ -21,7 +21,12 @@ +$NetBSD: patch-aa,v 1.2 2007/12/18 17:03:35 rumble Exp $ +--- radeontool.c.orig 2007-12-17 21:35:53.000000000 -0500 ++++ radeontool.c 2007-12-17 21:42:16.000000000 -0500 +@@ -21,7 +21,17 @@ #include <sys/stat.h> #include <fcntl.h> #include <sys/mman.h> +#ifdef __NetBSD__ ++#include <sys/param.h> ++#if __NetBSD_Prereq__(4,99,32) ++#include <sys/mutex.h> ++#else +#include <sys/lock.h> ++#endif +#include <machine/vmparam.h> -+#else ++#else /* ! __NetBSD__ */ #include <asm/page.h> +#endif #include "radeon_reg.h" -@@ -251,7 +256,6 @@ +@@ -251,7 +261,6 @@ } else if(forkrc == 0) { /* if child */ close(pipefd[0]); dup2(pipefd[1],1); /* stdout */ @@ -22,7 +27,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/01/24 15:07:35 jmcneill Exp $ execlp("lspci","lspci","-v",NULL); fatal("exec lspci failure\n"); } -@@ -307,7 +311,13 @@ +@@ -307,7 +316,13 @@ } if(debug) printf("%s",line); |