Module Name: src
Committed By: pooka
Date: Sun Jan 9 12:20:10 UTC 2011
Modified Files:
src/sys/rump/librump/rumpkern: rump_private.h
Log Message:
Allow multiple RUMP_COMPONENT() in one file.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/rump/librump/rumpkern/rump_private.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/librump/rumpkern/rump_private.h
diff -u src/sys/rump/librump/rumpkern/rump_private.h:1.66 src/sys/rump/librump/rumpkern/rump_private.h:1.67
--- src/sys/rump/librump/rumpkern/rump_private.h:1.66 Fri Jan 7 15:10:22 2011
+++ src/sys/rump/librump/rumpkern/rump_private.h Sun Jan 9 12:20:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_private.h,v 1.66 2011/01/07 15:10:22 pooka Exp $ */
+/* $NetBSD: rump_private.h,v 1.67 2011/01/09 12:20:10 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -66,13 +66,13 @@
void (*rc_init)(void);
};
#define RUMP_COMPONENT(type) \
-static void rumpcompinit(void); \
-static const struct rump_component rumpcomp = { \
+static void rumpcompinit##type(void); \
+static const struct rump_component rumpcomp##type = { \
.rc_type = type, \
- .rc_init = rumpcompinit, \
+ .rc_init = rumpcompinit##type, \
}; \
-__link_set_add_rodata(rump_components, rumpcomp); \
-static void rumpcompinit(void)
+__link_set_add_rodata(rump_components, rumpcomp##type); \
+static void rumpcompinit##type(void)
#define FLAWLESSCALL(call) \
do { \
