gh-85277: Fix building without stropts.h or empty stropts.h
#143521
+164
−146
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shadchin
requested review from
AA-Turner,
corona10,
emmatyping and
erlend-aasland
as code owners
picnixz
reviewed
Jan 7, 2026
configure.ac
Outdated
Comment on lines
3031
to
3033
| #if !defined(I_PUSH) | ||
| #error I_PUSH | ||
| #endif |
Member
There was a problem hiding this comment.
Use AC_CHECK_DECL instead of a program.
picnixz
reviewed
Jan 8, 2026
configure.ac
Outdated
| AC_COMPILE_IFELSE([ | ||
| AC_LANG_PROGRAM([[ | ||
| AC_CHECK_DECL([I_PUSH], [ | ||
| AC_DEFINE([HAVE_STROPTS_H], [1], [Define to 1 if you have the <stropts.h> header file.]) |
Member
There was a problem hiding this comment.
Please properly wrap the calls. E.g., use the 2-space indents for inner blocks. Have a look at https://github.com/python/cpython/pull/142380/files#r2615800453 and the code I commented.
picnixz
reviewed
Jan 8, 2026
Member
picnixz
left a comment
picnixz
left a comment
There was a problem hiding this comment.
Please add a NEWS entry as well.
Member
|
There is still some style issue. I will write a suggestion when I am on a laptop. |
picnixz
reviewed
Jan 9, 2026
Comment on lines
+3025
to
+3030
| AC_CHECK_DECL([I_PUSH], [AC_DEFINE([HAVE_STROPTS_H], [1], [Define to 1 if you have the <stropts.h> header file.])], [], [ | ||
| #ifdef HAVE_SYS_TYPES_H | ||
| #include <sys/types.h> | ||
| #endif | ||
| #include <stropts.h> | ||
| ]) |
Member
There was a problem hiding this comment.
Suggested change
| AC_CHECK_DECL([I_PUSH], [AC_DEFINE([HAVE_STROPTS_H], [1], [Define to 1 if you have the <stropts.h> header file.])], [], [ | |
| #ifdef HAVE_SYS_TYPES_H | |
| #include <sys/types.h> | |
| #endif | |
| #include <stropts.h> | |
| ]) | |
| AC_CHECK_DECL([I_PUSH], [ | |
| AC_DEFINE( | |
| [HAVE_STROPTS_H], [1], | |
| [Define to 1 if you have the <stropts.h> header file.] | |
| )], [], [ | |
| #ifdef HAVE_SYS_TYPES_H | |
| # include <sys/types.h> | |
| #endif | |
| #include <stropts.h> | |
| ]) |
Hopefully, I got my brackets right. Otherwise, put them when they are needed. m4 has some weird syntax and the way I put my blank lines may also be not supported.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added a check that not only do we have
stropts.h, butI_PUSHis also defined.I used
I_PUSHbecause it is used in two places (Modules/posixmodule.c,Modules/fcntlmodule.c), the rest of the definitions are only inModules/fcntlmodule.c.Also fix for gh-81541 if building without OpenPTY and without stropts.h.
Other related issues: