From ba04076f162b23f1070b465edeeb12df6d3bba76 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Mon, 5 Dec 2016 22:53:04 +0200 Subject: [PATCH] Move definitions to not conflict with C includes --- cores/esp32/Arduino.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h index f55edb73..137177da 100644 --- a/cores/esp32/Arduino.h +++ b/cores/esp32/Arduino.h @@ -136,6 +136,11 @@ void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val); #include "HardwareSerial.h" #include "Esp.h" +uint16_t makeWord(uint16_t w); +uint16_t makeWord(byte h, byte l); + +#define word(...) makeWord(__VA_ARGS__) + // WMath prototypes long random(long); #endif /* __cplusplus */ @@ -152,12 +157,6 @@ long map(long, long, long, long, long); #define _min(a,b) ((a)<(b)?(a):(b)) #define _max(a,b) ((a)>(b)?(a):(b)) - -uint16_t makeWord(uint16_t w); -uint16_t makeWord(byte h, byte l); - -#define word(...) makeWord(__VA_ARGS__) - #include "pins_arduino.h" #endif /* _ESP32_CORE_ARDUINO_H_ */