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.

4 files changed, 5 insertions, 6 deletions

diff --git a/lib.c b/lib.c
index d1f765a9..9b7adc17 100644
--- a/lib.c
+++ b/lib.c
@@ -94,7 +94,7 @@ val define_s, output_s, single_s, first_s, last_s, empty_s;
 val repeat_s, rep_s, flatten_s, forget_s;
 val local_s, merge_s, bind_s, rebind_s, cat_s;
 val try_s, catch_s, finally_s, throw_s, defex_s, deffilter_s;
-val eof_s, eol_s, assert_s;
+val eof_s, eol_s, assert_s, name_s;
 val error_s, type_error_s, internal_error_s;
 val numeric_error_s, range_error_s;
 val query_error_s, file_error_s, process_error_s, syntax_error_s;
@@ -8140,6 +8140,7 @@ static void obj_init(void)
   syntax_error_s = intern(lit("syntax-error"), user_package);
   system_error_s = intern(lit("system-error"), user_package);
   assert_s = intern(lit("assert"), user_package);
+  name_s = intern(lit("name"), user_package);
 
   args_k = intern(lit("args"), keyword_package);
   nothrow_k = intern(lit("nothrow"), keyword_package);
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;
diff --git a/match.c b/match.c
index d2c2ef6e..eed2f7ef 100644
--- a/match.c
+++ b/match.c
@@ -60,7 +60,7 @@ val decline_k, next_spec_k, repeat_spec_k;
 val mingap_k, maxgap_k, gap_k, mintimes_k, maxtimes_k, times_k;
 val lines_k, chars_k;
 val text_s, choose_s, gather_s, do_s, mod_s, modlast_s;
-val line_s, data_s, name_s, fuzz_s, load_s;
+val line_s, data_s, fuzz_s, load_s;
 val include_s, close_s, require_s;
 val longest_k, shortest_k, greedy_k;
 val vars_k, resolve_k;
@@ -4148,7 +4148,6 @@ static void syms_init(void)
   modlast_s = intern(lit("modlast"), user_package);
   line_s = intern(lit("line"), user_package);
   data_s = intern(lit("data"), user_package);
-  name_s = intern(lit("name"), user_package);
   fuzz_s = intern(lit("fuzz"), user_package);
   counter_k = intern(lit("counter"), keyword_package);
 }
diff --git a/sysif.c b/sysif.c
index eba00a27..825f5697 100644
--- a/sysif.c
+++ b/sysif.c
@@ -85,7 +85,7 @@ val gid_s, rdev_s, size_s, blksize_s, blocks_s;
 val atime_s, mtime_s, ctime_s;
 
 #if HAVE_PWUID
-val passwd_s, name_s, gecos_s, dir_s, shell_s;
+val passwd_s, gecos_s, dir_s, shell_s;
 #endif
 
 #if HAVE_GRGID
@@ -1160,7 +1160,6 @@ void sysif_init(void)
   ctime_s = intern(lit("ctime"), user_package);
 #if HAVE_PWUID
   passwd_s = intern(lit("passwd"), user_package);
-  name_s = intern(lit("name"), user_package);
   gecos_s = intern(lit("gecos"), user_package);
   dir_s = intern(lit("dir"), user_package);
   shell_s = intern(lit("shell"), user_package);