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

Include relevant system headers before defining fallbacks #17129

Closed
wants to merge 1 commit into from

Conversation

cmb69
Copy link
Member

@cmb69 cmb69 commented Dec 12, 2024

Otherwise we may define the fallbacks, and later inclusion of the system headers may attempt to redefine those.

Fixes GH-17112.


Note that I don't know if we need to include both arpa/inet.h and netinet/in.h to avoid this issue for INADDR_NONE, but it likely doesn't hurt, and #17124 seems to be a cleaner solution anyway (however, we cannot apply that to stable branches, so this is more a stop-gap measure).

cc @nielsdos (since you've fixed the other part of #17112).

Otherwise we may define the fallbacks, and later inclusion of the
system headers may attempt to redefine those.

Fixes phpGH-17112.
@cmb69 cmb69 mentioned this pull request Dec 12, 2024
@nielsdos
Copy link
Member

Yeah this seems fine to me for stable branches.

@cmb69 cmb69 marked this pull request as ready for review December 13, 2024 15:05
@cmb69 cmb69 requested a review from bukka as a code owner December 13, 2024 15:05
@cmb69 cmb69 closed this in fcbfd5a Dec 22, 2024
@cmb69 cmb69 deleted the cmb/17112 branch December 22, 2024 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants