Module Name: src
Committed By: pgoyette
Date: Sun Mar 11 00:58:12 UTC 2018
Modified Files:
src/sys/sys [pgoyette-compat]: module.h
Log Message:
Don't use () around __CONCAT as the expression is no longer constant
To generate a diff of this commit:
cvs rdiff -u -r1.41.14.4 -r1.41.14.5 src/sys/sys/module.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/sys/module.h
diff -u src/sys/sys/module.h:1.41.14.4 src/sys/sys/module.h:1.41.14.5
--- src/sys/sys/module.h:1.41.14.4 Sun Mar 11 00:53:13 2018
+++ src/sys/sys/module.h Sun Mar 11 00:58:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: module.h,v 1.41.14.4 2018/03/11 00:53:13 pgoyette Exp $ */
+/* $NetBSD: module.h,v 1.41.14.5 2018/03/11 00:58:12 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -153,9 +153,9 @@ static void __CONCAT(moddtor_,name)(void
#endif /* RUMP_USE_CTOR */
#define MODULE(class, name, required) \
- MODULE_ALIAS(class, name, required, NULL)
+ MODULE_WITH_ALIAS(class, name, required, NULL)
-#define MODULE_ALIAS(class, name, required, aliases) \
+#define MODULE_WITH_ALIAS(class, name, required, aliases) \
static int __CONCAT(name,_modcmd)(modcmd_t, void *); \
static const char * const * __CONCAT(name,_aliases) = { aliases }; \
static const modinfo_t __CONCAT(name,_modinfo) = { \
@@ -163,7 +163,7 @@ static const modinfo_t __CONCAT(name,_mo
.mi_class = (class), \
.mi_modcmd = __CONCAT(name,_modcmd), \
.mi_name = __STRING(name), \
- .mi_aliases = (__CONCAT(name,_aliases)), \
+ .mi_aliases = __CONCAT(name,_aliases), \
.mi_required = (required) \
}; \
_MODULE_REGISTER(name)
