Skip to content

Commit 22b2687

Browse files
dok-netdevyte
authored andcommitted
Conflict with pre-included Arduino.h (the indirect includes thereof) (#6853)
* Conflict with pre-included Arduino.h (the indirect includes thereof) resolved. * Include both time.h and sys/time.h
1 parent 40f5a99 commit 22b2687

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

cores/esp8266/sntp-lwip2.cpp

+1-22
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
*/
3939

4040
#include <lwip/init.h>
41+
#include <time.h>
4142
#include <sys/time.h>
4243
#include <osapi.h>
4344
#include <os_type.h>
@@ -133,30 +134,8 @@ static const int year_lengths[2] = {
133134
365,
134135
366
135136
} ;
136-
struct tm
137-
{
138-
int tm_sec;
139-
int tm_min;
140-
int tm_hour;
141-
int tm_mday;
142-
int tm_mon;
143-
int tm_year;
144-
int tm_wday;
145-
int tm_yday;
146-
int tm_isdst;
147-
};
148137

149138
struct tm res_buf;
150-
typedef struct __tzrule_struct
151-
{
152-
char ch;
153-
int m;
154-
int n;
155-
int d;
156-
int s;
157-
time_t change;
158-
int offset;
159-
} __tzrule_type;
160139

161140
__tzrule_type sntp__tzrule[2];
162141
struct tm *

0 commit comments

Comments
 (0)