Module Name: src
Committed By: pooka
Date: Fri Mar 1 13:52:31 UTC 2013
Modified Files:
src/lib/librumpuser: Makefile
src/sys/rump/include/rump: rumpuser.h
Log Message:
limit use of rumpuser.h to where it is meant to be used from
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/librumpuser/Makefile
cvs rdiff -u -r1.73 -r1.74 src/sys/rump/include/rump/rumpuser.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/librumpuser/Makefile
diff -u src/lib/librumpuser/Makefile:1.6 src/lib/librumpuser/Makefile:1.7
--- src/lib/librumpuser/Makefile:1.6 Wed Mar 21 05:37:44 2012
+++ src/lib/librumpuser/Makefile Fri Mar 1 13:52:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/03/21 05:37:44 matt Exp $
+# $NetBSD: Makefile,v 1.7 2013/03/01 13:52:31 pooka Exp $
#
WARNS?= 5
@@ -8,6 +8,7 @@ WARNS?= 5
LIB= rumpuser
LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
+CPPFLAGS+= -DLIBRUMPUSER
#CPPFLAGS+= -D_DIAGNOSTIC
SRCS= rumpuser.c rumpuser_net.c
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.73 src/sys/rump/include/rump/rumpuser.h:1.74
--- src/sys/rump/include/rump/rumpuser.h:1.73 Fri Sep 14 16:29:21 2012
+++ src/sys/rump/include/rump/rumpuser.h Fri Mar 1 13:52:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.73 2012/09/14 16:29:21 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.74 2013/03/01 13:52:31 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -28,6 +28,10 @@
#ifndef _RUMP_RUMPUSER_H_
#define _RUMP_RUMPUSER_H_
+#if !defined(_KERNEL) && !defined(LIBRUMPUSER)
+#error The rump/rumpuser.h interface is not for non-kernel consumers
+#endif
+
#ifdef _KERNEL
#include <sys/stdint.h>
#else
