From 6df4e281851bdfa596d2cf84925b9eaf1779c81c Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 6 Dec 2022 23:01:23 -0600 Subject: [PATCH] Update: Wrap the conversion digits defines in _di_f_conversion_digits_d_. Also remove the extra _di_f_type_number_64_t_ from the build disable defines. --- build/disable/level_0/f_conversion.h | 2 +- build/stand_alone/byte_dump.config.h | 1 + level_0/f_conversion/c/conversion/common.h | 74 +++++++++++++++--------------- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/build/disable/level_0/f_conversion.h b/build/disable/level_0/f_conversion.h index 5b1865f..9314057 100644 --- a/build/disable/level_0/f_conversion.h +++ b/build/disable/level_0/f_conversion.h @@ -11,8 +11,8 @@ #define _di_f_conversion_data_flag_ #define _di_f_conversion_data_t_ #define _di_f_conversion_data_t_defines_ +#define _di_f_conversion_digits_d_ #define _di_f_conversion_number_signed_print_ #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/stand_alone/byte_dump.config.h b/build/stand_alone/byte_dump.config.h index 486df56..ad4a930 100644 --- a/build/stand_alone/byte_dump.config.h +++ b/build/stand_alone/byte_dump.config.h @@ -55,6 +55,7 @@ //#define _di_f_conversion_data_flag_ //#define _di_f_conversion_data_t_ #define _di_f_conversion_data_t_defines_ +//#define _di_f_conversion_digits_d_ //#define _di_f_conversion_number_signed_print_ #define _di_f_conversion_number_signed_to_string_ //#define _di_f_conversion_number_unsigned_print_ diff --git a/level_0/f_conversion/c/conversion/common.h b/level_0/f_conversion/c/conversion/common.h index 5f6815b..16be6f4 100644 --- a/level_0/f_conversion/c/conversion/common.h +++ b/level_0/f_conversion/c/conversion/common.h @@ -23,56 +23,58 @@ extern "C" { * * 64-bit is the designed default. */ -#ifndef _di_f_type_number_64_t_ - #define F_conversion_digits_binary_unsigned_d 64 - #define F_conversion_digits_binary_signed_d 63 +#ifndef _di_f_conversion_digits_d_ + #ifndef _di_f_type_number_64_t_ + #define F_conversion_digits_binary_unsigned_d 64 + #define F_conversion_digits_binary_signed_d 63 - #define F_conversion_digits_octal_unsigned_d 22 - #define F_conversion_digits_octal_signed_d 22 + #define F_conversion_digits_octal_unsigned_d 22 + #define F_conversion_digits_octal_signed_d 22 - #define F_conversion_digits_decimal_unsigned_d 19 - #define F_conversion_digits_decimal_signed_d 19 + #define F_conversion_digits_decimal_unsigned_d 19 + #define F_conversion_digits_decimal_signed_d 19 - #define F_conversion_digits_duodecimal_unsigned_d 18 - #define F_conversion_digits_duodecimal_signed_d 18 + #define F_conversion_digits_duodecimal_unsigned_d 18 + #define F_conversion_digits_duodecimal_signed_d 18 - #define F_conversion_digits_hexidecimal_unsigned_d 16 - #define F_conversion_digits_hexidecimal_signed_d 16 -#endif // _di_f_type_number_64_t_ + #define F_conversion_digits_hexidecimal_unsigned_d 16 + #define F_conversion_digits_hexidecimal_signed_d 16 + #endif // _di_f_type_number_64_t_ -#ifdef _en_f_type_number_32_t_ - #define F_conversion_digits_binary_unsigned_d 32 - #define F_conversion_digits_binary_signed_d 31 + #ifdef _en_f_type_number_32_t_ + #define F_conversion_digits_binary_unsigned_d 32 + #define F_conversion_digits_binary_signed_d 31 - #define F_conversion_digits_octal_unsigned_d 10 - #define F_conversion_digits_octal_signed_d 10 + #define F_conversion_digits_octal_unsigned_d 10 + #define F_conversion_digits_octal_signed_d 10 - #define F_conversion_digits_decimal_unsigned_d 9 - #define F_conversion_digits_decimal_signed_d 9 + #define F_conversion_digits_decimal_unsigned_d 9 + #define F_conversion_digits_decimal_signed_d 9 - #define F_conversion_digits_duodecimal_unsigned_d 8 - #define F_conversion_digits_duodecimal_signed_d 8 + #define F_conversion_digits_duodecimal_unsigned_d 8 + #define F_conversion_digits_duodecimal_signed_d 8 - #define F_conversion_digits_hexidecimal_unsigned_d 8 - #define F_conversion_digits_hexidecimal_signed_d 8 -#endif // _en_f_type_number_32_t_ + #define F_conversion_digits_hexidecimal_unsigned_d 8 + #define F_conversion_digits_hexidecimal_signed_d 8 + #endif // _en_f_type_number_32_t_ -#ifdef _en_f_type_number_128_t_ - #define F_conversion_digits_binary_unsigned_d 128 - #define F_conversion_digits_binary_signed_d 127 + #ifdef _en_f_type_number_128_t_ + #define F_conversion_digits_binary_unsigned_d 128 + #define F_conversion_digits_binary_signed_d 127 - #define F_conversion_digits_octal_unsigned_d 43 - #define F_conversion_digits_octal_signed_d 43 + #define F_conversion_digits_octal_unsigned_d 43 + #define F_conversion_digits_octal_signed_d 43 - #define F_conversion_digits_decimal_unsigned_d 38 - #define F_conversion_digits_decimal_signed_d 38 + #define F_conversion_digits_decimal_unsigned_d 38 + #define F_conversion_digits_decimal_signed_d 38 - #define F_conversion_digits_duodecimal_unsigned_d 36 - #define F_conversion_digits_duodecimal_signed_d 36 + #define F_conversion_digits_duodecimal_unsigned_d 36 + #define F_conversion_digits_duodecimal_signed_d 36 - #define F_conversion_digits_hexidecimal_unsigned_d 32 - #define F_conversion_digits_hexidecimal_signed_d 32 -#endif // _en_f_type_number_128_t_ + #define F_conversion_digits_hexidecimal_unsigned_d 32 + #define F_conversion_digits_hexidecimal_signed_d 32 + #endif // _en_f_type_number_128_t_ +#endif // _di_f_conversion_digits_d_ /** * Provide a structure for customizing conversion settings for a conversion function to use. -- 1.8.3.1