6 files changed, 23 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e20e156..216038b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2015-08-07  Kaz Kylheku  <kaz@kylheku.com>
 
+	C++ upkeep: resolve multiple definitions of fun_k.
+
+	* eval.c (fun_k): Global definition removed.
+	(eval_init): Do not initialize fun_k here.
+
+	* filter.c (fun_k): Definition removed.
+	(filter_init): Do not initialize fun_k.
+
+	* filter.h (fun_k): Declaration removed.
+
+	* lib.c (fun_k): Defined in this file now.
+	(obj_init): Initialize fun_k here.
+
+	* lib.h (fun_k): Declare here.
+
+2015-08-07  Kaz Kylheku  <kaz@kylheku.com>
+
 	* Makefile (SRCS): When top_srcdir is blank, elide the entire
 	--work-tree argument to git. On Cygwin, git throws a strange error
 	message when --work-tree is given a blank argument.
diff --git a/eval.c b/eval.c
index 398955f0..614e7992 100644
--- a/eval.c
+++ b/eval.c
@@ -94,7 +94,7 @@ val fbind_s, lbind_s, flet_s, labels_s;
 val opip_s, oand_s, chain_s, chand_s;
 val sys_load_s, sys_lisp1_value_s;
 
-val special_s, whole_k, symacro_k, fun_k;
+val special_s, whole_k, symacro_k;
 
 val last_form_evaled, last_form_expanded;
 
@@ -4083,7 +4083,6 @@ void eval_init(void)
   whole_k = intern(lit("whole"), keyword_package);
   special_s = intern(lit("special"), system_package);
   symacro_k = intern(lit("symacro"), keyword_package);
-  fun_k = intern(lit("fun"), keyword_package);
   prof_s = intern(lit("prof"), user_package);
   opip_s = intern(lit("opip"), user_package);
   oand_s = intern(lit("oand"), user_package);
diff --git a/filter.c b/filter.c
index 1a4a2f76..1a854810 100644
--- a/filter.c
+++ b/filter.c
@@ -46,7 +46,7 @@
 
 val filters;
 val filter_k, lfilt_k, rfilt_k, to_html_k, from_html_k;
-val upcase_k, downcase_k, fun_k;
+val upcase_k, downcase_k;
 val topercent_k, frompercent_k, tourl_k, fromurl_k;
 val tonumber_k, tointeger_k, tofloat_k, hextoint_k;
 
@@ -692,7 +692,6 @@ void filter_init(void)
   from_html_k = intern(lit("from_html"), keyword_package);
   upcase_k = intern(lit("upcase"), keyword_package);
   downcase_k = intern(lit("downcase"), keyword_package);
-  fun_k = intern(lit("fun"), keyword_package);
   topercent_k = intern(lit("topercent"), keyword_package);
   frompercent_k = intern(lit("frompercent"), keyword_package);
   tourl_k = intern(lit("tourl"), keyword_package);
diff --git a/filter.h b/filter.h
index 3e4fbcac..249fe64d 100644
--- a/filter.h
+++ b/filter.h
@@ -26,7 +26,7 @@
 
 extern val filters;
 extern val filter_k, lfilt_k, rfilt_k, to_html_k, from_html_k;
-extern val upcase_k, downcase_k, fun_k;
+extern val upcase_k, downcase_k;
 extern val topercent_k, frompercent_k, tourl_k, fromurl_k;
 extern val tonumber_k, tointeger_k, tofloat_k, hextoint_k;
 
diff --git a/lib.c b/lib.c
index 71a9c991..7b3b2233 100644
--- a/lib.c
+++ b/lib.c
@@ -97,7 +97,7 @@ val query_error_s, file_error_s, process_error_s, syntax_error_s;
 val system_error_s;
 val gensym_counter_s;
 
-val nothrow_k, args_k, colon_k, auto_k;
+val nothrow_k, args_k, colon_k, auto_k, fun_k;
 
 val null_string;
 val nil_string;
@@ -6902,6 +6902,7 @@ static void obj_init(void)
   nothrow_k = intern(lit("nothrow"), keyword_package);
   colon_k = intern(lit(""), keyword_package);
   auto_k = intern(lit("auto"), keyword_package);
+  fun_k = intern(lit("fun"), keyword_package);
 
   equal_f = func_n2(equal);
   eq_f = func_n2(eq);
diff --git a/lib.h b/lib.h
index 86cf0b01..fd05954f 100644
--- a/lib.h
+++ b/lib.h
@@ -397,7 +397,7 @@ extern val gensym_counter_s;
 
 #define gensym_counter (deref(lookup_var_l(nil, gensym_counter_s)))
 
-extern val nothrow_k, args_k, colon_k, auto_k;
+extern val nothrow_k, args_k, colon_k, auto_k, fun_k;
 
 extern val null_string;
 extern val null_list; /* (nil) */