Module Name: src
Committed By: pooka
Date: Tue Sep 10 16:53:06 UTC 2013
Modified Files:
src/lib/librumpclient: Makefile rumpclient.c
src/lib/librumphijack: Makefile hijack.c hijackdlsym.c
Log Message:
use <rump/rumpuser_port.h>
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/librumpclient/Makefile
cvs rdiff -u -r1.54 -r1.55 src/lib/librumpclient/rumpclient.c
cvs rdiff -u -r1.12 -r1.13 src/lib/librumphijack/Makefile
cvs rdiff -u -r1.105 -r1.106 src/lib/librumphijack/hijack.c
cvs rdiff -u -r1.4 -r1.5 src/lib/librumphijack/hijackdlsym.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/Makefile
diff -u src/lib/librumpclient/Makefile:1.8 src/lib/librumpclient/Makefile:1.9
--- src/lib/librumpclient/Makefile:1.8 Wed May 15 20:27:00 2013
+++ src/lib/librumpclient/Makefile Tue Sep 10 16:53:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/05/15 20:27:00 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2013/09/10 16:53:06 pooka Exp $
#
.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
@@ -18,7 +18,7 @@ LIBDPLIBS+= ${lib} lib
.endfor
CPPFLAGS+= -DRUMP_CLIENT
-CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR} -I${.CURDIR}/../librumpuser
+CPPFLAGS+= -I${.OBJDIR} -I${.CURDIR}
SRCS= rumpclient.c
SRCS+= rump_syscalls.c
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.54 src/lib/librumpclient/rumpclient.c:1.55
--- src/lib/librumpclient/rumpclient.c:1.54 Thu Jan 17 20:47:44 2013
+++ src/lib/librumpclient/rumpclient.c Tue Sep 10 16:53:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.54 2013/01/17 20:47:44 pooka Exp $ */
+/* $NetBSD: rumpclient.c,v 1.55 2013/09/10 16:53:06 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
* Client side routines for rump syscall proxy.
*/
-#include "rumpuser_port.h"
+#include <rump/rumpuser_port.h>
/*
* We use kqueue on NetBSD, poll elsewhere. Theoretically we could
@@ -48,7 +48,7 @@
#define USE_KQUEUE
#endif
-__RCSID("$NetBSD: rumpclient.c,v 1.54 2013/01/17 20:47:44 pooka Exp $");
+__RCSID("$NetBSD: rumpclient.c,v 1.55 2013/09/10 16:53:06 pooka Exp $");
#include <sys/param.h>
#include <sys/mman.h>
Index: src/lib/librumphijack/Makefile
diff -u src/lib/librumphijack/Makefile:1.12 src/lib/librumphijack/Makefile:1.13
--- src/lib/librumphijack/Makefile:1.12 Mon Jul 29 10:13:21 2013
+++ src/lib/librumphijack/Makefile Tue Sep 10 16:53:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/07/29 10:13:21 pooka Exp $
+# $NetBSD: Makefile,v 1.13 2013/09/10 16:53:06 pooka Exp $
#
LIB= rumphijack
@@ -10,7 +10,7 @@ MAN= rumphijack.3
SRCS= hijack.c hijackdlsym.c
-CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT -I${.CURDIR}/../librumpuser
+CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT
WARNS?= 5
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.105 src/lib/librumphijack/hijack.c:1.106
--- src/lib/librumphijack/hijack.c:1.105 Wed Jul 31 12:23:25 2013
+++ src/lib/librumphijack/hijack.c Tue Sep 10 16:53:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.105 2013/07/31 12:23:25 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.106 2013/09/10 16:53:06 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -25,10 +25,10 @@
* SUCH DAMAGE.
*/
-#include "rumpuser_port.h"
+#include <rump/rumpuser_port.h>
#if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.105 2013/07/31 12:23:25 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.106 2013/09/10 16:53:06 pooka Exp $");
#endif
#include <sys/param.h>
Index: src/lib/librumphijack/hijackdlsym.c
diff -u src/lib/librumphijack/hijackdlsym.c:1.4 src/lib/librumphijack/hijackdlsym.c:1.5
--- src/lib/librumphijack/hijackdlsym.c:1.4 Thu Jul 18 22:58:35 2013
+++ src/lib/librumphijack/hijackdlsym.c Tue Sep 10 16:53:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hijackdlsym.c,v 1.4 2013/07/18 22:58:35 pooka Exp $ */
+/* $NetBSD: hijackdlsym.c,v 1.5 2013/09/10 16:53:06 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -25,10 +25,10 @@
* SUCH DAMAGE.
*/
-#include "rumpuser_port.h"
+#include <rump/rumpuser_port.h>
#if !defined(lint)
-__RCSID("$NetBSD: hijackdlsym.c,v 1.4 2013/07/18 22:58:35 pooka Exp $");
+__RCSID("$NetBSD: hijackdlsym.c,v 1.5 2013/09/10 16:53:06 pooka Exp $");
#endif
#include <dlfcn.h>
