X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fmware%2Fformatwr.c;h=ac2cbffe376ea28760122f15f617823240f88bbf;hb=4128f7132429072564952d3244d41e92bd3cfd46;hp=b87a904cbe5c0e5fa65df69c33c957fc7b584af0;hpb=11da44352fcd4d33b173c976db45293ac1a87cca;p=bertos.git

diff --git a/bertos/mware/formatwr.c b/bertos/mware/formatwr.c
index b87a904c..ac2cbffe 100644
--- a/bertos/mware/formatwr.c
+++ b/bertos/mware/formatwr.c
@@ -79,7 +79,7 @@
 
 #include "formatwr.h"
 
-#include <cfg/cfg_formatwr.h>  /* CONFIG_ macros */
+#include "cfg/cfg_formatwr.h"  /* CONFIG_ macros */
 #include <cfg/debug.h>         /* ASSERT */
 
 #include <mware/pgm.h>
@@ -899,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 */