Applied change to fix issue in itoa.c and itoa.h with newer versions of GCC (using the changes from STM's fix, in Arduino_Core_STM32)

rogerclarkmelbourne · rogerclarkmelbourne · commit b19fc38e5e8e · 2017-05-26T17:00:47.000+10:00
diff --git a/STM32F1/cores/maple/itoa.c b/STM32F1/cores/maple/itoa.c
@@ -120,8 +120,12 @@ extern char* ltoa( long value, char *string, int radix )
 
   return string;
 }
-
+#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 9 || \
+   (__GNUC_MINOR__ == 9 && __GNUC_PATCHLEVEL__ > 2)))
+extern char* utoa( unsigned value, char *string, int radix )
+#else
 extern char* utoa( unsigned long value, char *string, int radix )
+#endif
 {
   return ultoa( value, string, radix ) ;
 }
diff --git a/STM32F1/cores/maple/itoa.h b/STM32F1/cores/maple/itoa.h
@@ -31,7 +31,12 @@ extern void itoa( int n, char s[] ) ;
 
 extern char* itoa( int value, char *string, int radix ) ;
 extern char* ltoa( long value, char *string, int radix ) ;
+#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 9 || \
+   (__GNUC_MINOR__ == 9 && __GNUC_PATCHLEVEL__ > 2)))
+extern char* utoa( unsigned value, char *string, int radix ) ;
+#else
 extern char* utoa( unsigned long value, char *string, int radix ) ;
+#endif
 extern char* ultoa( unsigned long value, char *string, int radix ) ;
 #endif /* 0 */
 
diff --git a/STM32F4/cores/maple/itoa.c b/STM32F4/cores/maple/itoa.c
@@ -120,8 +120,12 @@ extern char* ltoa( long value, char *string, int radix )
 
   return string;
 }
-
+#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 9 || \
+   (__GNUC_MINOR__ == 9 && __GNUC_PATCHLEVEL__ > 2)))
+extern char* utoa( unsigned value, char *string, int radix )
+#else
 extern char* utoa( unsigned long value, char *string, int radix )
+#endif
 {
   return ultoa( value, string, radix ) ;
 }
diff --git a/STM32F4/cores/maple/itoa.h b/STM32F4/cores/maple/itoa.h
@@ -31,7 +31,12 @@ extern void itoa( int n, char s[] ) ;
 
 extern char* itoa( int value, char *string, int radix ) ;
 extern char* ltoa( long value, char *string, int radix ) ;
+#if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 9 || \
+   (__GNUC_MINOR__ == 9 && __GNUC_PATCHLEVEL__ > 2)))
+extern char* utoa( unsigned value, char *string, int radix ) ;
+#else
 extern char* utoa( unsigned long value, char *string, int radix ) ;
+#endif
 extern char* ultoa( unsigned long value, char *string, int radix ) ;
 #endif /* 0 */
 

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,12 @@ extern char* ltoa( long value, char *string, int radix )`
`120`	`120`
`121`	`121`	`return string;`
`122`	`122`	`}`
`123`		`-`
	`123`	`+#if __GNUC__ > 4 \|\| (__GNUC__ == 4 && (__GNUC_MINOR__ > 9 \|\| \`
	`124`	`+ (__GNUC_MINOR__ == 9 && __GNUC_PATCHLEVEL__ > 2)))`
	`125`	`+extern char* utoa( unsigned value, char *string, int radix )`
	`126`	`+#else`
`124`	`127`	`extern char* utoa( unsigned long value, char *string, int radix )`
	`128`	`+#endif`
`125`	`129`	`{`
`126`	`130`	`return ultoa( value, string, radix ) ;`
`127`	`131`	`}`