WMath.cpp doesn't include Arduino.h, where makeWord(h, l) is declared…

…, common denominator type therefore is uint8_t, which is in use already in Arduino.h, too. (#5230) Fixes #5229
espressif · Jun 9, 2021 · 77f5044 · 77f5044
1 parent 67de199
commit 77f5044
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h
@@ -165,7 +165,7 @@ using std::min;
 using ::round;
 
 uint16_t makeWord(uint16_t w);
-uint16_t makeWord(byte h, byte l);
+uint16_t makeWord(uint8_t h, uint8_t l);
 
 #define word(...) makeWord(__VA_ARGS__)
 

diff --git a/cores/esp32/WMath.cpp b/cores/esp32/WMath.cpp
@@ -77,12 +77,12 @@ long map(long x, long in_min, long in_max, long out_min, long out_max) {
     return (delta * dividend + (divisor / 2)) / divisor + out_min;
 }
 
-unsigned int makeWord(unsigned int w)
+uint16_t makeWord(uint16_t w)
 {
     return w;
 }
 
-unsigned int makeWord(unsigned char h, unsigned char l)
+uint16_t makeWord(uint8_t h, uint8_t l)
 {
     return (h << 8) | l;
 }