Skip to content
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.

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

Removed unneeded undef min|max, they no longer clash with vector et al #3856

Closed
wants to merge 15 commits into from
Closed

Conversation

devyte
Copy link
Collaborator

@devyte devyte commented Nov 21, 2017

No description provided.

@devyte
Copy link
Collaborator Author

devyte commented Nov 21, 2017

@igrr I need a bit of help with this one. I wanted to remove two remaining #undef min|max left over from before the Arduino.h fix submitted some days ago (see top commit above), but Travis failed when building tests. To my surprise, I found another Arduino.h in there, which has fallen behind vs. the core one. I tried bringing it somewhat to par with the current Arduino.h, specifically with the min|max fix, but the build still fails, this time complaining about isnan etc already defined.
Oddly, if I run make under tests/host locally in my Ubuntu machine, it builds fine.
At this point, I suspect an issue with the version of gcc. Travis builds with 4.8.4, while my linux box has 5.4.0.
How can I remove the two #undef min|max without breaking the build?

@devyte
Copy link
Collaborator Author

devyte commented Dec 28, 2017

@igrr ping
Not critical for 2.4.0, but I'd love to get this cleanup in.

@devyte devyte self-assigned this Jan 11, 2018
@devyte
Copy link
Collaborator Author

devyte commented Jan 18, 2018

Alright, it looks like there is no point to pursue this under gcc 4.x. From what I can gather, the whole isnan/isinf thing was known under gcc >= 4.6, and a patch was applied at some point later (I couldn't figure out the details). Probably gcc 5.x has it.
So there isn't much point in pursuing this one until after we migrate to a newer gcc.

@earlephilhower earlephilhower added this to the 3.0.0 milestone Sep 28, 2019
@earlephilhower
Copy link
Collaborator

To 3.0.0 as we'll probably be on GCC 9 for that release and will be able to use this.

@earlephilhower earlephilhower added the merge-conflict PR has a merge conflict that needs manual correction label Feb 27, 2020
earlephilhower added a commit to earlephilhower/Arduino that referenced this pull request Jan 13, 2021
Remove a straggler `undef min/max` from core header
Supersedes esp8266#3856
earlephilhower added a commit that referenced this pull request Jan 13, 2021
Remove a straggler `undef min/max` from core header
Supersedes #3856
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-conflict PR has a merge conflict that needs manual correction
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants