[src/trunk]: src/lib Fixes when compiling against musl libc.

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/755fefef2e91
branches:  trunk
changeset: 788803:755fefef2e91
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Jul 20 18:46:15 2013 +0000

description:
Fixes when compiling against musl libc.

from Justin Cormack via private email

diffstat:

 lib/librumphijack/hijack.c      |   5 +++--
 lib/librumpuser/rumpuser_port.h |  10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 8700468a8dd5 -r 755fefef2e91 lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Sat Jul 20 15:55:57 2013 +0000
+++ b/lib/librumphijack/hijack.c        Sat Jul 20 18:46:15 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: hijack.c,v 1.101 2013/07/18 22:58:35 pooka Exp $      */
+/*      $NetBSD: hijack.c,v 1.102 2013/07/20 18:46:15 pooka Exp $      */
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -31,7 +31,7 @@
 #include "rumpuser_port.h"
 
 #if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.101 2013/07/18 22:58:35 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.102 2013/07/20 18:46:15 pooka Exp $");
 #endif
 
 #include <sys/param.h>
@@ -44,6 +44,7 @@
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/time.h>
+#include <sys/uio.h>
 
 #ifdef PLATFORM_HAS_KQUEUE
 #include <sys/event.h>
diff -r 8700468a8dd5 -r 755fefef2e91 lib/librumpuser/rumpuser_port.h
--- a/lib/librumpuser/rumpuser_port.h   Sat Jul 20 15:55:57 2013 +0000
+++ b/lib/librumpuser/rumpuser_port.h   Sat Jul 20 18:46:15 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser_port.h,v 1.18 2013/04/28 13:17:26 pooka Exp $ */
+/*     $NetBSD: rumpuser_port.h,v 1.19 2013/07/20 18:46:15 pooka Exp $ */
 
 /*
  * Portability header for non-NetBSD platforms.
@@ -159,6 +159,14 @@
 #define __UNCONST(_a_) ((void *)(unsigned long)(const void *)(_a_))
 #endif
 
+#ifndef __CONCAT
+#define __CONCAT(x,y)  x ## y
+#endif
+
+#ifndef __STRING
+#define __STRING(x)    #x
+#endif
+
 #if defined(__linux__) || defined(__sun__) || defined (__CYGWIN__)
 #define RUMPUSER_RANDOM() random()
 #define RUMPUSER_USE_DEVRANDOM