From 1f43838977c840cc3112f94d50c6344a4a0776c7 Mon Sep 17 00:00:00 2001
From: "Frederic.Pillon" <frederic.pillon@st.com>
Date: Mon, 17 Dec 2018 10:30:45 +0100
Subject: [PATCH] Do not provide some default macro's

Include utils.h manually will provide them
Note: str() and xstr() are now capitalized.


Fix #389

Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
---
 cores/arduino/utils.h  | 12 +++++-------
 cores/arduino/wiring.h |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/cores/arduino/utils.h b/cores/arduino/utils.h
index fc00c25d83..84b18cca10 100644
--- a/cores/arduino/utils.h
+++ b/cores/arduino/utils.h
@@ -1,15 +1,13 @@
 #ifndef __UTILS_H
 #define __UTILS_H
 
-#include "avr/dtostrf.h"
-
-// Concatenate 2 strings
+/* Concatenate 2 strings */
 #define CONCAT(s1, s2) (s1 s2)
-// Concatenate 2 strings separated by space
+/* Concatenate 2 strings separated by space */
 #define CONCATS(s1, s2) (s1" " s2)
 
-// Stringification
-#define xstr(s) str(s)
-#define str(s) #s
+/* Stringification */
+#define XSTR(s) STR(s)
+#define STR(s) #s
 
 #endif
diff --git a/cores/arduino/wiring.h b/cores/arduino/wiring.h
index af6cc34621..c1596f7213 100644
--- a/cores/arduino/wiring.h
+++ b/cores/arduino/wiring.h
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <math.h>
 
+#include "avr/dtostrf.h"
 #include "binary.h"
 #include "itoa.h"
-#include "utils.h"
 
 #include "wiring_analog.h"
 #include "wiring_constants.h"