Module Name: src
Committed By: pooka
Date: Sat Jul 20 18:46:15 UTC 2013
Modified Files:
src/lib/librumphijack: hijack.c
src/lib/librumpuser: rumpuser_port.h
Log Message:
Fixes when compiling against musl libc.
from Justin Cormack via private email
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/lib/librumphijack/hijack.c
cvs rdiff -u -r1.18 -r1.19 src/lib/librumpuser/rumpuser_port.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.101 src/lib/librumphijack/hijack.c:1.102
--- src/lib/librumphijack/hijack.c:1.101 Thu Jul 18 22:58:35 2013
+++ src/lib/librumphijack/hijack.c Sat Jul 20 18:46:15 2013
@@ -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 @@ __RCSID("$NetBSD: hijack.c,v 1.101 2013/
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <sys/time.h>
+#include <sys/uio.h>
#ifdef PLATFORM_HAS_KQUEUE
#include <sys/event.h>
Index: src/lib/librumpuser/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.18 src/lib/librumpuser/rumpuser_port.h:1.19
--- src/lib/librumpuser/rumpuser_port.h:1.18 Sun Apr 28 13:17:26 2013
+++ src/lib/librumpuser/rumpuser_port.h Sat Jul 20 18:46:15 2013
@@ -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 @@ posix_memalign(void **ptr, size_t align,
#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
