diff options
Diffstat (limited to 'graphics/xv/patches/patch-af')
| -rw-r--r-- | graphics/xv/patches/patch-af | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/graphics/xv/patches/patch-af b/graphics/xv/patches/patch-af index f28b366a548..2a3cdf4e075 100644 --- a/graphics/xv/patches/patch-af +++ b/graphics/xv/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $ +$NetBSD: patch-af,v 1.7 2007/07/08 10:50:26 wiz Exp $ ---- xv.h.orig 2006-03-15 11:00:24.000000000 -0800 +--- xv.h.orig 2007-06-08 07:24:51.000000000 +0000 +++ xv.h -@@ -137,9 +137,7 @@ +@@ -138,9 +138,7 @@ #endif @@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $ /* include files */ -@@ -158,7 +156,7 @@ +@@ -159,7 +157,7 @@ #ifndef VMS # include <errno.h> # ifndef __NetBSD__ @@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $ extern int errno; /* SHOULD be in errno.h, but often isn't */ extern char *sys_errlist[]; /* this too... */ # endif -@@ -170,7 +168,7 @@ +@@ -171,7 +169,7 @@ #ifdef VMS # define ERRSTR(x) strerror(x, vaxc$errno) #else @@ -31,27 +31,14 @@ $NetBSD: patch-af,v 1.6 2006/03/15 19:27:31 minskim Exp $ # define ERRSTR(x) strerror(x) # else # define ERRSTR(x) sys_errlist[x] -@@ -215,7 +213,9 @@ +@@ -207,7 +205,9 @@ # if defined(hp300) || defined(hp800) || defined(NeXT) - # include <sys/malloc.h> /* it's in 'sys' on HPs and NeXT */ + # include <sys/malloc.h> /* it's in "sys" on HPs and NeXT */ # else --# include <malloc.h> -+# ifndef __DARWIN__ -+# include <malloc.h> -+# endif +-# include <malloc.h> ++# ifndef __DARWIN__ ++# include <malloc.h> ++# endif # endif - # endif - #endif /* !VMS */ -@@ -345,7 +345,11 @@ #endif - #ifndef S_IRWUSR --# define S_IRWUSR (S_IRUSR|__S_IWRITE) -+# ifdef __S_IWRITE -+# define S_IRWUSR (S_IRUSR|__S_IWRITE) -+# else -+# define S_IRWUSR (S_IRUSR|S_IWUSR) -+# endif - #endif - - #ifndef MAXPATHLEN |