[pkgsrc/trunk]: pkgsrc/databases/db4/patches Rename "iovec" to "iovec_p", av...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63ea72637193
branches:  trunk
changeset: 635482:63ea72637193
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Jun 07 08:17:52 2014 +0000

description:
Rename "iovec" to "iovec_p",  avoid to conflict with "struct iovec" defined in
sys/uio.h.
Fixes build on Haiku with gcc2.

diffstat:

 databases/db4/patches/patch-repmgr_repmgr__posix.c |  44 ++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)

diffs (48 lines):

diff -r ab744aa4e662 -r 63ea72637193 databases/db4/patches/patch-repmgr_repmgr__posix.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/db4/patches/patch-repmgr_repmgr__posix.c        Sat Jun 07 08:17:52 2014 +0000
@@ -0,0 +1,44 @@
+$NetBSD: patch-repmgr_repmgr__posix.c,v 1.1 2014/06/07 08:17:52 obache Exp $
+
+* avoid to conflict with "struct iovec" defined in sys/uio.h.
+
+--- repmgr/repmgr_posix.c.orig 2010-04-12 20:25:35.000000000 +0000
++++ repmgr/repmgr_posix.c
+@@ -488,15 +488,15 @@ __repmgr_wake_main_thread(env)
+  * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *));
+  */
+ int
+-__repmgr_writev(fd, iovec, buf_count, byte_count_p)
++__repmgr_writev(fd, iovec_p, buf_count, byte_count_p)
+       socket_t fd;
+-      db_iovec_t *iovec;
++      db_iovec_t *iovec_p;
+       int buf_count;
+       size_t *byte_count_p;
+ {
+       int nw;
+ 
+-      if ((nw = writev(fd, iovec, buf_count)) == -1)
++      if ((nw = writev(fd, iovec_p, buf_count)) == -1)
+               return (errno);
+       *byte_count_p = (size_t)nw;
+       return (0);
+@@ -506,15 +506,15 @@ __repmgr_writev(fd, iovec, buf_count, by
+  * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *));
+  */
+ int
+-__repmgr_readv(fd, iovec, buf_count, byte_count_p)
++__repmgr_readv(fd, iovec_p, buf_count, byte_count_p)
+       socket_t fd;
+-      db_iovec_t *iovec;
++      db_iovec_t *iovec_p;
+       int buf_count;
+       size_t *byte_count_p;
+ {
+       ssize_t nw;
+ 
+-      if ((nw = readv(fd, iovec, buf_count)) == -1)
++      if ((nw = readv(fd, iovec_p, buf_count)) == -1)
+               return (errno);
+       *byte_count_p = (size_t)nw;
+       return (0);