jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make compiler not complain about 2 random prototypes

Browse Source 
Issue is when Arduino.h is included in C file
This commit is contained in:
me-no-dev 2016-11-13 13:23:44 +02:00
parent d1b94df9a9
commit 2515a3cfed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cores/esp32/Arduino.h
View File

@ -134,8 +134,14 @@ typedef unsigned int word;
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include "Esp.h" #include "Esp.h"
// WMath prototypes
long random(long);
#endif /* __cplusplus */ #endif /* __cplusplus */
long random(long, long);
void randomSeed(unsigned long);
long map(long, long, long, long, long);
#ifndef _GLIBCXX_VECTOR #ifndef _GLIBCXX_VECTOR
// arduino is not compatible with std::vector // arduino is not compatible with std::vector
#define min(a,b) ((a)<(b)?(a):(b)) #define min(a,b) ((a)<(b)?(a):(b))
@ -145,12 +151,6 @@ typedef unsigned int word;
#define _min(a,b) ((a)<(b)?(a):(b)) #define _min(a,b) ((a)<(b)?(a):(b))
#define _max(a,b) ((a)>(b)?(a):(b)) #define _max(a,b) ((a)>(b)?(a):(b))
// WMath prototypes
long random(long);
long random(long, long);
void randomSeed(unsigned long);
long map(long, long, long, long, long);
#include "pins_arduino.h" #include "pins_arduino.h"
#endif /* _ESP32_CORE_ARDUINO_H_ */ #endif /* _ESP32_CORE_ARDUINO_H_ */