[pkgsrc/trunk]: pkgsrc/editors/ex Adjust valloc return value on DragonFly to ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e49697e46403
branches:  trunk
changeset: 504335:e49697e46403
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 09 14:10:39 2005 +0000

description:
Adjust valloc return value on DragonFly to not conflict with unistd.h.

diffstat:

 editors/ex/distinfo         |   4 ++--
 editors/ex/patches/patch-ac |  16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r ba26dbbe7c41 -r e49697e46403 editors/ex/distinfo
--- a/editors/ex/distinfo       Fri Dec 09 13:56:51 2005 +0000
+++ b/editors/ex/distinfo       Fri Dec 09 14:10:39 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/11/08 21:46:03 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/12/09 14:10:39 joerg Exp $
 
 SHA1 (ex-040103.tar.gz) = 51fa1d613b37a4f3aed1ef2968be691465cdff09
 RMD160 (ex-040103.tar.gz) = 5fc3f222dde5a8d00e1b233281ccf210affdbdf1
 Size (ex-040103.tar.gz) = 284130 bytes
 SHA1 (patch-aa) = 134513a18d1a5192818eccd456d91857fda82860
 SHA1 (patch-ab) = 5bac9911e71b7fe787023568a7a46d1e87fb4d0e
-SHA1 (patch-ac) = f95a9cfc90616d7ce9c202871b8bfe0175e4f26f
+SHA1 (patch-ac) = 2dcda20524bb2f2e6a4569c4571905352ca75a34
diff -r ba26dbbe7c41 -r e49697e46403 editors/ex/patches/patch-ac
--- a/editors/ex/patches/patch-ac       Fri Dec 09 13:56:51 2005 +0000
+++ b/editors/ex/patches/patch-ac       Fri Dec 09 14:10:39 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2005/11/08 21:39:12 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2005/12/09 14:10:39 joerg Exp $
 
---- mapmalloc.c.orig   2003-01-28 15:04:25.000000000 -0500
+--- mapmalloc.c.orig   2003-01-28 20:04:25.000000000 +0000
 +++ mapmalloc.c
 @@ -54,6 +54,9 @@
  #include <fcntl.h>
@@ -12,3 +12,15 @@
  #ifdef        __GLIBC__
  /*
   * Broken GNU libc will include stdlib.h with conflicting
+@@ -551,7 +554,11 @@ size_t alignment, size;
+ }
+ 
+ /*ARGSUSED*/
++#if defined(__DragonFly__)
++void *
++#else
+ char *
++#endif
+ valloc(size)
+ size_t size;
+ {