From b4600c3facdbee07763bfbd72417267987c1f52d Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 17 Feb 2024 17:43:23 -0600 Subject: [PATCH] Update: Remove incorrect dependencies and remove some defines. The f_fss_status code defines are removed to favor similar simplification done for the f_status defines. The f_account is not used by the fll_execute project as far as I can tell. --- build/stand_alone/fake.config.h | 4 ---- level_0/f_fss/c/fss/common.h | 28 ++++++++++------------------ level_2/fll_execute/data/build/dependencies | 1 - level_2/fll_execute/data/build/settings | 2 +- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/build/stand_alone/fake.config.h b/build/stand_alone/fake.config.h index 50f98fd..bfce988 100644 --- a/build/stand_alone/fake.config.h +++ b/build/stand_alone/fake.config.h @@ -633,10 +633,6 @@ //#define _di_f_fss_skip_past_delimit_ //#define _di_f_fss_skip_past_space_ //#define _di_f_fss_state_flag_e_ -//#define _di_f_fss_status_codes_e_ -//#define _di_f_fss_status_error_e_ -//#define _di_f_fss_status_success_e_ -//#define _di_f_fss_status_warning_e_ //#define _di_f_fss_type_s_ #define _di_f_f_utf_space_em_per_four_s_ #define _di_f_f_utf_space_em_per_six_s_ diff --git a/level_0/f_fss/c/fss/common.h b/level_0/f_fss/c/fss/common.h index ce3ba3e..af43901 100644 --- a/level_0/f_fss/c/fss/common.h +++ b/level_0/f_fss/c/fss/common.h @@ -231,27 +231,19 @@ extern "C" { enum { F_fss_status_code_first = F_status_code_last + 1, - #ifndef _di_f_fss_status_error_e_ - F_fss_format, - F_fss_format_eos, - #endif // _di_f_fss_status_error_e_ + F_fss_format, + F_fss_format_eos, - #ifndef _di_f_fss_status_warning_e_ - F_fss_accepted_invalid, - F_fss_accepted_invalid_eos, - #endif // _di_f_fss_status_warning_e_ + F_fss_accepted_invalid, + F_fss_accepted_invalid_eos, - #ifndef _di_f_fss_status_success_e_ - F_fss_found_content, - F_fss_found_object, - F_fss_found_object_content_not, - F_fss_found_content_not, - F_fss_found_object_not, - #endif // _di_f_fss_status_success_e_ + F_fss_found_content, + F_fss_found_object, + F_fss_found_object_content_not, + F_fss_found_content_not, + F_fss_found_object_not, - #ifndef _di_f_fss_status_codes_e_ - F_fss_found_comment, - #endif // _di_f_fss_status_codes_e_ + F_fss_found_comment, F_fss_status_code_last, }; // enum diff --git a/level_2/fll_execute/data/build/dependencies b/level_2/fll_execute/data/build/dependencies index f0f2989..436d3c7 100644 --- a/level_2/fll_execute/data/build/dependencies +++ b/level_2/fll_execute/data/build/dependencies @@ -4,7 +4,6 @@ f_type f_status f_memory f_string -f_account f_capability f_environment f_execute diff --git a/level_2/fll_execute/data/build/settings b/level_2/fll_execute/data/build/settings index 6749b7a..41a3b95 100644 --- a/level_2/fll_execute/data/build/settings +++ b/level_2/fll_execute/data/build/settings @@ -31,7 +31,7 @@ build_indexer_arguments rcs build_language c build_libraries -lc -lcap -build_libraries-individual -lfl_control_group -lfl_environment -lf_account -lf_capability -lf_control_group -lf_environment -lf_execute -lf_file -lf_limit -lf_memory -lf_path -lf_signal -lf_string -lf_type_array -lf_utf +build_libraries-individual -lfl_control_group -lfl_environment -lf_capability -lf_control_group -lf_environment -lf_execute -lf_file -lf_limit -lf_memory -lf_path -lf_signal -lf_string -lf_type_array -lf_utf build_libraries-individual_thread -lf_thread build_sources_library execute.c private-execute.c -- 1.8.3.1