Module Name: src
Committed By: pooka
Date: Wed Nov 21 17:41:27 UTC 2012
Modified Files:
src/lib/librumpuser: rumpuser_port.h
src/sys/rump/include/rump: rump.h
Log Message:
export register_t to rump kernel users on solaris
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/librumpuser/rumpuser_port.h
cvs rdiff -u -r1.54 -r1.55 src/sys/rump/include/rump/rump.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/rumpuser_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.4 src/lib/librumpuser/rumpuser_port.h:1.5
--- src/lib/librumpuser/rumpuser_port.h:1.4 Sun Nov 18 19:29:40 2012
+++ src/lib/librumpuser/rumpuser_port.h Wed Nov 21 17:41:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_port.h,v 1.4 2012/11/18 19:29:40 pooka Exp $ */
+/* $NetBSD: rumpuser_port.h,v 1.5 2012/11/21 17:41:27 pooka Exp $ */
/*
* Portability header for non-NetBSD platforms.
@@ -15,10 +15,6 @@
#ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
#define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
-#ifdef __sun__
-typedef long register_t;
-#endif
-
#ifdef __NetBSD__
#include <sys/cdefs.h>
#include <sys/param.h>
@@ -168,4 +164,9 @@ posix_memalign(void **ptr, size_t align,
#define MSG_NOSIGNAL 0
#endif
+#if defined(__sun__) && !defined(RUMP_REGISTER_T)
+#define RUMP_REGISTER_T long
+typedef RUMP_REGISTER_T register_t;
+#endif
+
#endif /* _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ */
Index: src/sys/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.54 src/sys/rump/include/rump/rump.h:1.55
--- src/sys/rump/include/rump/rump.h:1.54 Fri Jul 20 09:27:11 2012
+++ src/sys/rump/include/rump/rump.h Wed Nov 21 17:41:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.h,v 1.54 2012/07/20 09:27:11 pooka Exp $ */
+/* $NetBSD: rump.h,v 1.55 2012/11/21 17:41:27 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -57,6 +57,11 @@ typedef struct prop_dictionary *prop_dic
#endif
#endif /* __NetBSD__ */
+#if defined(__sun__) && !defined(RUMP_REGISTER_T)
+#define RUMP_REGISTER_T long
+typedef RUMP_REGISTER_T register_t;
+#endif
+
#include <rump/rumpvnode_if.h>
#include <rump/rumpdefs.h>
