Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2019
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8c186b
Conflict with pre-included Arduino.h (the indirect includes thereof) …
dok-net Nov 28, 2019
4fa20f0
Include both time.h and sys/time.h
dok-net Nov 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions cores/esp8266/sntp-lwip2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
*/

#include <lwip/init.h>
#include <time.h>
#include <sys/time.h>
#include <osapi.h>
#include <os_type.h>
Expand Down Expand Up @@ -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 *
Expand Down