Skip to content

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

Merged
devyte merged 2 commits into
esp8266:masterfrom
dok-net:sntp-lwip2-redefines
Nov 28, 2019
Merged

Conflict with pre-included Arduino.h (the indirect includes thereof)#6853
devyte merged 2 commits into
esp8266:masterfrom
dok-net:sntp-lwip2-redefines

Conversation

@dok-net
Copy link
Copy Markdown
Contributor

@dok-net dok-net commented Nov 28, 2019

Fixes #6852

d-a-v
d-a-v approved these changes Nov 28, 2019
View reviewed changes
Copy link
Copy Markdown
Collaborator

@d-a-v d-a-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is a conflict with a (famous) external NTP library,
we can try to use #include <../include/time.h> instead

@mcspr
Copy link
Copy Markdown
Collaborator

mcspr commented Nov 28, 2019 •
edited
Loading

Yep, note of the #6730 that fixed conflicts with TimeLib
<time.h> === <Time.h> for case insensitive filesystems on mac and windows, idk though if that depends on build system (pio, ide, clion etc.) and how it composes -I<dir> for the compiler

@d-a-v
Copy link
Copy Markdown
Collaborator

d-a-v commented Nov 28, 2019

To check if lwip1 is enabled: example.

#include "lwip/init.h" // LWIP_VERSION_

@devyte devyte merged commit 22b2687 into esp8266:master Nov 28, 2019
@devyte devyte added this to the 2.7.0 milestone Nov 28, 2019
@dok-net dok-net deleted the sntp-lwip2-redefines branch November 28, 2019 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@d-a-v d-a-v d-a-v approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.7.0

Development

Successfully merging this pull request may close these issues.

Conflicting type definition depending on include order

4 participants

@dok-net @mcspr @d-a-v @devyte