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.

diff --git a/build/disable/level_0/f_conversion.h b/build/disable/level_0/f_conversion.h
index 5b1865f1b9e91cde6336e4367b3aae0352129691..9314057cf40cd4eaa6317eea8dd722c031f2fb0c 100644 (file)
--- 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 486df561e25768ed1ca859983cecee65c782d52a..ad4a930536d3e36d316b5587e5a4f8ead8b5a910 100644 (file)
--- 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 5f6815b0e69b64f3249b44deaa699b51193baa8b..16be6f4eb3a951c34838761ec4fb07f85d41ecac 100644 (file)
--- 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.