diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2015-08-07 22:05:38 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2015-08-07 22:05:38 -0700 |
commit | af996f5191f3385769e2eb58153cc9039d0fcc28 (patch) | |
tree | 3889266b1999e63066fd9fc4193c3ca78f60bdd8 /eval.c | |
parent | e7c7d32277dd4ab3b381f9d5daa03e4b2ded75d1 (diff) | |
download | txr-af996f5191f3385769e2eb58153cc9039d0fcc28.tar.gz txr-af996f5191f3385769e2eb58153cc9039d0fcc28.tar.bz2 txr-af996f5191f3385769e2eb58153cc9039d0fcc28.zip |
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.
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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); |