From cf9da93b61c4e98b4449d0f9226a69a4b6c02dad Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Thu, 30 Apr 2015 19:06:11 +0800
Subject: [PATCH] Remove some definitions from global namespace

Names like kB, MB and kHz are likely to collide with variable names in user sketches.
Nowadays this should be implemented using c++14 user-defined literals (http://en.cppreference.com/w/cpp/language/user_literal)
---
 cores/esp8266/Arduino.h | 12 ------------
 cores/esp8266/Esp.cpp   | 11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
index 3060ba185..19c25e899 100644
--- a/cores/esp8266/Arduino.h
+++ b/cores/esp8266/Arduino.h
@@ -82,18 +82,6 @@ void yield(void);
 #define degrees(rad) ((rad)*RAD_TO_DEG)
 #define sq(x) ((x)*(x))
 
-#define kHz (1000L)
-#define MHz (1000L*kHz)
-#define GHz (1000L*MHz)
-
-#define kBit (1024L)
-#define MBit (1024L*kBit)
-#define GBit (1024L*MBit)
-
-#define kB (1024L)
-#define MB (1024L*kB)
-#define GB (1024L*MB)
-
 void ets_intr_lock();
 void ets_intr_unlock();
 
diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
index 8a38a4dcd..190ff3009 100644
--- a/cores/esp8266/Esp.cpp
+++ b/cores/esp8266/Esp.cpp
@@ -24,6 +24,17 @@ extern "C" {
 #include "user_interface.h"
 }
 
+#define kHz (1000L)
+#define MHz (1000L*kHz)
+#define GHz (1000L*MHz)
+
+#define kBit (1024L)
+#define MBit (1024L*kBit)
+#define GBit (1024L*MBit)
+
+#define kB (1024L)
+#define MB (1024L*kB)
+#define GB (1024L*MB)
 
 //extern "C" void ets_wdt_init(uint32_t val);
 extern "C" void ets_wdt_enable(void);