X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fmware%2Fformatwr.c;h=ac2cbffe376ea28760122f15f617823240f88bbf;hb=2f1343e2774ac66a35c63ee90535265d67c78feb;hp=6353e1f1347cdda23dd1e08389896b5d1c0dc130;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/mware/formatwr.c b/bertos/mware/formatwr.c
index 6353e1f1..ac2cbffe 100644
--- a/bertos/mware/formatwr.c
+++ b/bertos/mware/formatwr.c
@@ -78,10 +78,12 @@
 
 
 #include "formatwr.h"
+
+#include "cfg/cfg_formatwr.h"  /* CONFIG_ macros */
+#include <cfg/debug.h>         /* ASSERT */
+
 #include <mware/pgm.h>
 #include <mware/hex.h>
-#include <cfg/debug.h> /* ASSERT */
-#include <appconfig.h> /* CONFIG_ macros */
 
 #ifndef CONFIG_PRINTF_N_FORMATTER
 	/** Disable the arcane %n formatter. */
@@ -897,13 +899,22 @@ FLOATING_CONVERSION:
 CONVERSION_LOOP:
 #if CONFIG_PRINTF > PRINTF_NOMODIFIERS
 				if (h_modifier)
-					u_val = (format_flag == 'd') ?
-						(short)va_arg(ap, int) : (unsigned short)va_arg(ap, int);
+				{
+					if (format_flag == 'd')
+						u_val = (short)va_arg(ap, int);
+					else
+						u_val = (unsigned short)va_arg(ap, int);
+				}
 				else if (l_modifier)
 					u_val = va_arg(ap, long);
 				else
-					u_val = (format_flag == 'd') ?
-						va_arg(ap,int) : va_arg(ap,unsigned int);
+				{
+					if (format_flag == 'd')
+						u_val = va_arg(ap, int);
+					else
+						u_val = va_arg(ap, unsigned int);
+				}
+
 #else /* CONFIG_PRINTF > PRINTF_NOMODIFIERS */
 				u_val = va_arg(ap,int);
 #endif /* CONFIG_PRINTF > PRINTF_NOMODIFIERS */