robouden
diff --git a/‎cores/esp32/Arduino.h
Copy file name to clipboardExpand all lines: cores/esp32/Arduino.h
+9-7Lines changed: 9 additions & 7 deletions b/‎cores/esp32/Arduino.h
Copy file name to clipboardExpand all lines: cores/esp32/Arduino.h
+9-7Lines changed: 9 additions & 7 deletions
diff --git a/‎libraries/WiFi/src/WiFiClient.h
Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiClient.h
-2Lines changed: 0 additions & 2 deletions b/‎libraries/WiFi/src/WiFiClient.h
Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiClient.h
-2Lines changed: 0 additions & 2 deletions
diff --git a/‎libraries/WiFi/src/WiFiGeneric.cpp
Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiGeneric.cpp
+3-6Lines changed: 3 additions & 6 deletions b/‎libraries/WiFi/src/WiFiGeneric.cpp
Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiGeneric.cpp
+3-6Lines changed: 3 additions & 6 deletions
diff --git a/‎libraries/WiFi/src/WiFiMulti.h
Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiMulti.h
-2Lines changed: 0 additions & 2 deletions b/‎libraries/WiFi/src/WiFiMulti.h
Copy file name to clipboardExpand all lines: libraries/WiFi/src/WiFiMulti.h
-2Lines changed: 0 additions & 2 deletions
@@ -75,7 +75,6 @@
 
 #define abs(x) ((x)>0?(x):-(x))
 #define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
-#define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
 #define radians(deg) ((deg)*DEG_TO_RAD)
 #define degrees(rad) ((rad)*RAD_TO_DEG)
 #define sq(x) ((x)*(x))
@@ -146,6 +145,9 @@ void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 #ifdef __cplusplus
 }
 
+#include <algorithm>
+#include <cmath>
+
 #include "WCharacter.h"
 #include "WString.h"
 #include "Stream.h"
@@ -158,6 +160,12 @@ void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 #include "HardwareSerial.h"
 #include "Esp.h"
 
+using std::isinf;
+using std::isnan;
+using std::max;
+using std::min;
+using ::round;
+
 uint16_t makeWord(uint16_t w);
 uint16_t makeWord(byte h, byte l);
 
@@ -176,12 +184,6 @@ extern "C" void configTzTime(const char* tz,
 long random(long);
 #endif /* __cplusplus */
 
-#ifndef _GLIBCXX_VECTOR
-// arduino is not compatible with std::vector
-#define min(a,b) ((a)<(b)?(a):(b))
-#define max(a,b) ((a)>(b)?(a):(b))
-#endif
-
 #define _min(a,b) ((a)<(b)?(a):(b))
 #define _max(a,b) ((a)>(b)?(a):(b))
 
 
@@ -23,8 +23,6 @@
 
 #include "Arduino.h"
 #include "Client.h"
-#undef min
-#undef max
 #include <memory>
 
 class WiFiClientSocketHandle;
 
@@ -46,9 +46,6 @@ extern "C" {
 } //extern "C"
 
 #include "esp32-hal-log.h"
-
-#undef min
-#undef max
 #include <vector>
 
 #include "sdkconfig.h"
@@ -156,8 +153,8 @@ static bool espWiFiStart(bool persistent){
         return false;
     }
     _esp_wifi_started = true;
-    system_event_t event; 
-    event.event_id = SYSTEM_EVENT_WIFI_READY; 
+    system_event_t event;
+    event.event_id = SYSTEM_EVENT_WIFI_READY;
     WiFiGenericClass::_eventCallback(nullptr, &event);
 
     return true;
@@ -496,7 +493,7 @@ bool WiFiGenericClass::mode(wifi_mode_t m)
     } else if(cm && !m){
         return espWiFiStop();
     }
-    
+
     esp_err_t err;
     err = esp_wifi_set_mode(m);
     if(err){
 
@@ -27,8 +27,6 @@
 #define WIFICLIENTMULTI_H_
 
 #include "WiFi.h"
-#undef min
-#undef max
 #include <vector>
 
 typedef struct {