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

Add include of e_os2.h in quictestlib.c to allow symbol definition consistency. #22179

Closed
wants to merge 1 commit into from

Conversation

rsbeckerca
Copy link
Contributor

Fixes: #22178

Signed-of-by: Randall S. Becker randall.becker@nexbridge.ca

@rsbeckerca rsbeckerca force-pushed the fix-22178 branch 2 times, most recently from 293c9c5 to 587798f Compare September 23, 2023 17:00
@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Sep 23, 2023
@rsbeckerca rsbeckerca changed the title [WIP] Include sys/time.h on NonStop builds due to missing struct timeval. Include sys/time.h on NonStop builds due to missing struct timeval. Sep 23, 2023
@rsbeckerca
Copy link
Contributor Author

I have made this change NonStop-specific but I think it might apply to any c99 builds because the unspecified type, timeval, is rejected by the c99 compiler, not the platform. Please review and let me know if the include needs to move and what ifdef wrapping it otherwise needs.

@rsbeckerca
Copy link
Contributor Author

rsbeckerca commented Sep 23, 2023

This passed build/test on our platform.

@paulidale paulidale added branch: master Merge to master branch approval: review pending This pull request needs review by a committer triaged: bug The issue/pr is/fixes a bug tests: exempted The PR is exempt from requirements for testing labels Sep 24, 2023
Copy link
Member

@beldmit beldmit left a comment

Choose a reason for hiding this comment

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

LGTM

@beldmit beldmit added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Sep 24, 2023
Copy link
Member

@mattcaswell mattcaswell left a comment

Choose a reason for hiding this comment

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

We have plenty of code already that uses struct timeval which, as far as I know has compiled just fine on NonStop. I don't think this is the correct fix. I have an alternative suggestion in #22183.

@mattcaswell mattcaswell added approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member and removed approval: done This pull request has the required number of approvals labels Sep 25, 2023
Fixes: openssl#22178

Signed-of-by: Randall S. Becker <randall.becker@nexbridge.ca>
@rsbeckerca rsbeckerca changed the title Include sys/time.h on NonStop builds due to missing struct timeval. Move e_os2.h up in quictestlib.c to allow symbol definition consistency. Sep 25, 2023
@github-actions github-actions bot removed the severity: fips change The pull request changes FIPS provider sources label Sep 25, 2023
@rsbeckerca rsbeckerca changed the title Move e_os2.h up in quictestlib.c to allow symbol definition consistency. Add include of e_os2.h in quictestlib.c to allow symbol definition consistency. Sep 25, 2023
@rsbeckerca
Copy link
Contributor Author

I originally called this "Move" instead of "Add" because it was in comparison to the proposed change by @mattcaswell. This just moves where the #include is done compared to commit b01151d to make c99 happy.

@rsbeckerca
Copy link
Contributor Author

FYI: This change, commit 71c7128, did pass build/test on NonStop with c99.

@mattcaswell
Copy link
Member

This updated version looks much better.

@t8m t8m added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member labels Sep 26, 2023
@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Sep 27, 2023
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@mattcaswell
Copy link
Member

Pushed.

openssl-machine pushed a commit that referenced this pull request Sep 27, 2023
Fixes: #22178

Signed-of-by: Randall S. Becker <randall.becker@nexbridge.ca>

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #22179)
wanghao75 pushed a commit to openeuler-mirror/openssl that referenced this pull request Oct 9, 2023
Fixes: #22178

Signed-of-by: Randall S. Becker <randall.becker@nexbridge.ca>

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from openssl/openssl#22179)

Signed-off-by: fly2x <fly2x@hitls.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build fails on NonStop in quictestlib.c
6 participants