arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-12 14:41:29 +03:00
Code

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

Browse Source 
* Conflict with pre-included Arduino.h (the indirect includes thereof) resolved.

* Include both time.h and sys/time.h
This commit is contained in:
Dirk O. Kaar 2019-11-28 19:31:57 +01:00 committed by Develo
parent 40f5a99d03
commit 22b2687a25
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cores/esp8266/sntp-lwip2.cpp
View File

@ -38,6 +38,7 @@
*/ */
#include <lwip/init.h> #include <lwip/init.h>
#include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <osapi.h> #include <osapi.h>
#include <os_type.h> #include <os_type.h>
@ -133,30 +134,8 @@ static const int year_lengths[2] = {
365, 365,
366 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; 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]; __tzrule_type sntp__tzrule[2];
struct tm * struct tm *