summaryrefslogtreecommitdiffstats
path: root/sbin/geom/class/sched
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2010-09-13 13:48:18 +0000
committerpjd <pjd@FreeBSD.org>2010-09-13 13:48:18 +0000
commit3d8ce965d3cc7199c39bd29a375291b4276bab53 (patch)
tree80fa9ced0ed4ae38bb90b62555eb33be45347414 /sbin/geom/class/sched
parent7dc7517414123c9d33d848a1cb615f3adbb59e51 (diff)
downloadFreeBSD-src-3d8ce965d3cc7199c39bd29a375291b4276bab53.zip
FreeBSD-src-3d8ce965d3cc7199c39bd29a375291b4276bab53.tar.gz
- Remove gc_argname field. It was introduced for gpart(8), but if I
understand everything correctly, we don't really need it. - Provide default numeric value as strings. This allows to simplify a lot of code. - Bump version number.
Diffstat (limited to 'sbin/geom/class/sched')
-rw-r--r--sbin/geom/class/sched/geom_sched.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sbin/geom/class/sched/geom_sched.c b/sbin/geom/class/sched/geom_sched.c
index eba8e49..727913c 100644
--- a/sbin/geom/class/sched/geom_sched.c
+++ b/sbin/geom/class/sched/geom_sched.c
@@ -60,11 +60,13 @@ uint32_t version = G_SCHED_VERSION;
* Adapt to differences in geom library.
* in V1 struct g_command misses gc_argname, eld, and G_BOOL is undefined
*/
-#if G_LIB_VERSION == 1
-#define G_ARGNAME
+#if G_LIB_VERSION <= 1
#define G_TYPE_BOOL G_TYPE_NUMBER
-#else
+#endif
+#if G_LIB_VERSION >= 3 && G_LIB_VERSION <= 4
#define G_ARGNAME NULL,
+#else
+#define G_ARGNAME
#endif
static void
OpenPOWER on IntegriCloud