Conflict with pre-included Arduino.h (the indirect includes thereof) (esp8266#6853)

dok-net · devyte · commit 22b2687a2516 · 2019-11-28T15:31:57.000-03:00
* Conflict with pre-included Arduino.h (the indirect includes thereof) resolved.

* Include both time.h and sys/time.h
diff --git a/cores/esp8266/sntp-lwip2.cpp b/cores/esp8266/sntp-lwip2.cpp
@@ -38,6 +38,7 @@
  */
 
 #include <lwip/init.h>
+#include <time.h>
 #include <sys/time.h>
 #include <osapi.h>
 #include <os_type.h>
@@ -133,30 +134,8 @@ static const int year_lengths[2] = {
   365,
   366
 } ;
-struct tm
-{
-  int	tm_sec;
-  int	tm_min;
-  int	tm_hour;
-  int	tm_mday;
-  int	tm_mon;
-  int	tm_year;
-  int	tm_wday;
-  int	tm_yday;
-  int	tm_isdst;
-};
 
 struct tm res_buf;
-typedef struct __tzrule_struct
-{
-  char ch;
-  int m;
-  int n;
-  int d;
-  int s;
-  time_t change;
-  int offset;
-} __tzrule_type;
 
 __tzrule_type sntp__tzrule[2];
 struct tm *
