From 0707f8c438a67e379f6b34de02fe745defd18ea2 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 30 Dec 2015 19:07:35 -0800 Subject: C++ breakage: multiple definition of name_s. * lib.c (name_s): Defined here now. (obj_init): name_s initialized here. * lib.h (name_s): Declared. * match.c (name_s): Definition removed. (syms_init): Initialization of name_s removed. * sysif.c (name_s): Definition removed. (sysif_init): Initialization of name_s removed. --- lib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib.h') diff --git a/lib.h b/lib.h index 29984eb3..e8c87346 100644 --- a/lib.h +++ b/lib.h @@ -419,7 +419,7 @@ extern val define_s, output_s, single_s, first_s, last_s, empty_s; extern val repeat_s, rep_s, flatten_s, forget_s; extern val local_s, merge_s, bind_s, rebind_s, cat_s; extern val try_s, catch_s, finally_s, throw_s, defex_s, deffilter_s; -extern val eof_s, eol_s, assert_s; +extern val eof_s, eol_s, assert_s, name_s; extern val error_s, type_error_s, internal_error_s; extern val numeric_error_s, range_error_s; extern val query_error_s, file_error_s, process_error_s, syntax_error_s; -- cgit v1.2.3