From 1ce727b4afe37afc75f878bea84dec3e8238c414 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 14 Jan 2023 17:32:19 -0600 Subject: [PATCH] Update: The disable header files. --- build/disable/about.txt | 4 ++- build/disable/level_0/f_conversion.h | 1 + build/disable/level_0/f_status_string.h | 2 +- build/disable/level_0/f_string.h | 1 - build/disable/level_0/f_type.h | 48 ++++++++++++++++--------------- build/disable/level_2/fll_status_string.h | 19 ++++++++++++ 6 files changed, 49 insertions(+), 26 deletions(-) diff --git a/build/disable/about.txt b/build/disable/about.txt index 2843566..f36558e 100644 --- a/build/disable/about.txt +++ b/build/disable/about.txt @@ -23,7 +23,9 @@ These files are generated like the following: Make sure the parameter checking files do not exist. # sed -i -e '/_di_level_0_parameter_checking_/d' -e '/_di_level_1_parameter_checking_/d' -e '/_di_level_2_parameter_checking_/d' build/disable/level_?/*.h -There are some defines that need to be manually removed if they don't belong, such as "_di_pthread_support_" and "_di_libcap_". +Make sure to remove known special cases that are pulled in by the above process but should not exist. +# sed -i -e '/#define _di_libcap_/d' build/disable/level_?/*.h +# sed -i -e '/#define _di_thread_support_/d' build/disable/level_?/*.h Use these files to construct a list of all defines to potentially disable based on the "dependencies" of a given project. Consider the following example using the fake dependencies for the stand alone builds. diff --git a/build/disable/level_0/f_conversion.h b/build/disable/level_0/f_conversion.h index 9314057..9659987 100644 --- a/build/disable/level_0/f_conversion.h +++ b/build/disable/level_0/f_conversion.h @@ -16,3 +16,4 @@ #define _di_f_conversion_number_signed_to_string_ #define _di_f_conversion_number_unsigned_print_ #define _di_f_conversion_number_unsigned_to_string_ +#define _di_f_type_number_64_t_ diff --git a/build/disable/level_0/f_status_string.h b/build/disable/level_0/f_status_string.h index b7cf6d5..3a05e5c 100644 --- a/build/disable/level_0/f_status_string.h +++ b/build/disable/level_0/f_status_string.h @@ -18,5 +18,5 @@ #define _di_f_status_signal_s_ #define _di_f_status_socket_s_ #define _di_f_status_string_s_ -#define _di_f_status_string_to_s_ +#define _di_f_status_string_to_ #define _di_f_status_terminal_s_ diff --git a/build/disable/level_0/f_string.h b/build/disable/level_0/f_string.h index fd72caf..e3d06c6 100644 --- a/build/disable/level_0/f_string.h +++ b/build/disable/level_0/f_string.h @@ -174,4 +174,3 @@ #define _di_f_string_tripless_t_ #define _di_f_string_triples_t_ #define _di_f_string_triple_t_ -#define _di_string_ascii_s_ diff --git a/build/disable/level_0/f_type.h b/build/disable/level_0/f_type.h index 54f4c03..75a9665 100644 --- a/build/disable/level_0/f_type.h +++ b/build/disable/level_0/f_type.h @@ -1,4 +1,6 @@ #define _di_compiler_attributes_d_ +#define _di_f_array_lengthss_t_ +#define _di_f_array_lengths_t_ #define _di_f_array_length_t_ #define _di_f_cellss_t_ #define _di_f_cells_t_ @@ -7,10 +9,22 @@ #define _di_f_fll_idss_t_ #define _di_f_fll_ids_t_ #define _di_f_fll_id_t_ +#define _di_f_int128ss_t_ +#define _di_f_int128s_t_ #define _di_f_int_128_t_ +#define _di_f_int128_t_ +#define _di_f_int16ss_t_ +#define _di_f_int16s_t_ +#define _di_f_int32ss_t_ +#define _di_f_int32s_t_ +#define _di_f_int64ss_t_ +#define _di_f_int64s_t_ +#define _di_f_int8ss_t_ +#define _di_f_int8s_t_ #define _di_f_mode_t_ #define _di_f_statess_t_ #define _di_f_states_t_ +#define _di_f_state_t_ #define _di_f_statusss_t_ #define _di_f_statuss_t_ #define _di_f_status_t_ @@ -19,26 +33,14 @@ #define _di_f_type_input_output_d_ #define _di_f_type_number_64_t_ #define _di_f_type_sizes_d_ -#define _di_f_type_state_t_ -#define _di_int128ss_t_ -#define _di_int128s_t_ -#define _di_int128_t_ -#define _di_int16ss_t_ -#define _di_int16s_t_ -#define _di_int32ss_t_ -#define _di_int32s_t_ -#define _di_int64ss_t_ -#define _di_int64s_t_ -#define _di_int8ss_t_ -#define _di_int8s_t_ -#define _di_uint128ss_t_ -#define _di_uint128s_t_ -#define _di_uint128_t_ -#define _di_uint16ss_t_ -#define _di_uint16s_t_ -#define _di_uint32ss_t_ -#define _di_uint32s_t_ -#define _di_uint64ss_t_ -#define _di_uint64s_t_ -#define _di_uint8ss_t_ -#define _di_uint8s_t_ +#define _di_f_uint128ss_t_ +#define _di_f_uint128s_t_ +#define _di_f_uint128_t_ +#define _di_f_uint16ss_t_ +#define _di_f_uint16s_t_ +#define _di_f_uint32ss_t_ +#define _di_f_uint32s_t_ +#define _di_f_uint64ss_t_ +#define _di_f_uint64s_t_ +#define _di_f_uint8ss_t_ +#define _di_f_uint8s_t_ diff --git a/build/disable/level_2/fll_status_string.h b/build/disable/level_2/fll_status_string.h index c8e7541..7580596 100644 --- a/build/disable/level_2/fll_status_string.h +++ b/build/disable/level_2/fll_status_string.h @@ -1 +1,20 @@ #define _di_fll_status_string_from_ +#define _di_f_status_access_s_ +#define _di_f_status_array_s_ +#define _di_f_status_available_s_ +#define _di_f_status_basic_s_ +#define _di_f_status_boolean_s_ +#define _di_f_status_buffer_s_ +#define _di_f_status_busy_s_ +#define _di_f_status_compare_s_ +#define _di_f_status_directory_s_ +#define _di_f_status_end_s_ +#define _di_f_status_file_s_ +#define _di_f_status_filesystem_s_ +#define _di_f_status_network_s_ +#define _di_f_status_number_s_ +#define _di_f_status_process_s_ +#define _di_f_status_return_s_ +#define _di_f_status_signal_s_ +#define _di_f_status_socket_s_ +#define _di_f_status_terminal_s_ -- 1.8.3.1