From 5cd97baf39a37df327b31d06562c0e9dfa42a66f Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 26 Feb 2018 18:03:34 -0800 Subject: Require semicolon after static_{forward,def} macros. * lib.h (static_forward, static_def): At least the C version of these now require a trailing semicolon. * struct.c (struct_type_ops): Add required semicolon after static_def. * syslog.c (syslog_strm_ops): Add required semicolon after static_forward and after static_def. --- lib.h | 4 ++-- struct.c | 2 +- syslog.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib.h b/lib.h index 4448c287..f80f497a 100644 --- a/lib.h +++ b/lib.h @@ -1183,6 +1183,6 @@ loc list_collect_revappend(loc ptail, val obj); #define static_forward(decl) namespace { extern decl; } #define static_def(def) namespace { def; } #else -#define static_forward(decl) static decl; -#define static_def(def) static def; +#define static_forward(decl) static decl +#define static_def(def) static def #endif diff --git a/struct.c b/struct.c index 8c97484c..6178340b 100644 --- a/struct.c +++ b/struct.c @@ -1633,7 +1633,7 @@ val static_slot_type_reg(val slot, val strct) static_def(struct cobj_ops struct_type_ops = cobj_ops_init(eq, struct_type_print, struct_type_destroy, - struct_type_mark, cobj_eq_hash_op)) + struct_type_mark, cobj_eq_hash_op)); struct cobj_ops struct_inst_ops = cobj_ops_init_ex(struct_inst_equal, struct_inst_print, diff --git a/syslog.c b/syslog.c index 41b6bfe2..af46bce3 100644 --- a/syslog.c +++ b/syslog.c @@ -51,7 +51,7 @@ struct syslog_strm { val prio_k; -static_forward(struct strm_ops syslog_strm_ops) +static_forward(struct strm_ops syslog_strm_ops); void syslog_init(void) { @@ -231,7 +231,7 @@ static_def(struct strm_ops syslog_strm_ops = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, syslog_get_prop, syslog_set_prop, - 0, 0, 0, 0)) + 0, 0, 0, 0)); val make_syslog_stream(val prio) { -- cgit v1.2.3