Module Name: src
Committed By: pooka
Date: Fri Dec 20 09:06:35 UTC 2013
Modified Files:
src/sys/rump/net/lib/libshmif: shmif_busops.c shmifvar.h
Log Message:
header massage, mostly improves portability
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/libshmif/shmif_busops.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libshmif/shmifvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libshmif/shmif_busops.c
diff -u src/sys/rump/net/lib/libshmif/shmif_busops.c:1.9 src/sys/rump/net/lib/libshmif/shmif_busops.c:1.10
--- src/sys/rump/net/lib/libshmif/shmif_busops.c:1.9 Mon Mar 21 16:41:09 2011
+++ src/sys/rump/net/lib/libshmif/shmif_busops.c Fri Dec 20 09:06:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_busops.c,v 1.9 2011/03/21 16:41:09 pooka Exp $ */
+/* $NetBSD: shmif_busops.c,v 1.10 2013/12/20 09:06:35 pooka Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -28,19 +28,17 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shmif_busops.c,v 1.9 2011/03/21 16:41:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shmif_busops.c,v 1.10 2013/12/20 09:06:35 pooka Exp $");
#include <sys/param.h>
-#include <sys/atomic.h>
#ifndef _KERNEL
#include <assert.h>
+#include <inttypes.h>
#include <stdbool.h>
#include <string.h>
#define KASSERT(a) assert(a)
-#else
-#include <rump/rumpuser.h>
#endif
#include "shmifvar.h"
Index: src/sys/rump/net/lib/libshmif/shmifvar.h
diff -u src/sys/rump/net/lib/libshmif/shmifvar.h:1.6 src/sys/rump/net/lib/libshmif/shmifvar.h:1.7
--- src/sys/rump/net/lib/libshmif/shmifvar.h:1.6 Mon Mar 21 16:41:09 2011
+++ src/sys/rump/net/lib/libshmif/shmifvar.h Fri Dec 20 09:06:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: shmifvar.h,v 1.6 2011/03/21 16:41:09 pooka Exp $ */
+/* $NetBSD: shmifvar.h,v 1.7 2013/12/20 09:06:35 pooka Exp $ */
/*-
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -63,6 +63,7 @@ struct shmif_pkthdr {
#if 0
#ifdef _KERNEL
+#include <rump/rumpuser.h>
#define DPRINTF(x) rumpuser_dprintf x
#else
#define DPRINTF(x) printf x
