Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork34.3k
GH-131296: fix clang-cl warning on Windows in socketmodule.c#131821
GH-131296: fix clang-cl warning on Windows in socketmodule.c#131821zooba merged 3 commits intopython:mainfrom
Conversation
| #ifdef MS_WINDOWS | ||
| if (optname == SIO_TCP_SET_ACK_FREQUENCY) { | ||
| int dummy; | ||
| DWORD dummy; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
fix warning : incompatible pointer types passing 'int *' to parameter of type 'LPDWORD' (aka 'unsigned long *') [-Wincompatible-pointer-types]
Modules/socketmodule.c Outdated
| PyThread_acquire_lock(netdb_lock, 1); | ||
| #endif | ||
| SUPPRESS_DEPRECATED_CALL | ||
| _Py_COMP_DIAG_PUSH |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
The rest of the PR cares about deprecation warnings like
..\Modules\socketmodule.c(6070,9): warning : 'gethostbyname' is deprecated:Use getaddrinfo() or GetAddrInfoW() instead or define _WINSOCK_DEPRECATED_NO_WARNINGSto disable deprecated API warnings [-Wdeprecated-declarations]https://github.com/python/cpython/actions/runs/14044831663/job/39366560293?pr=131690#step:4:183
using the already existing infrastructure_Py_COMP_DIAG_PUSH et al. frompyport.h, because clang-cl unfortunately does not (yet) respect
# defineSUPPRESS_DEPRECATED_CALL __pragma(warning(suppress: 4996))
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Is there another way to spell the pragma that will work? The idea ofpyport.h is to deal with compiler differences as much as possible, so it's the place to handle it if the original macro can be made to work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
clang-cl does not understandsuppress, hence I need to push and pop and thus used the existing infrastructure frompyport.h (warning(disable: 4996))
Lines 308 to 311 in0045100
| #elif defined(_MSC_VER) | |
| #define_Py_COMP_DIAG_PUSH__pragma(warning(push)) | |
| #define_Py_COMP_DIAG_IGNORE_DEPR_DECLS__pragma(warning(disable:4996)) | |
| #define_Py_COMP_DIAG_POP__pragma(warning(pop)) |
Likewise, AFAIK, there is nosupress in gcc / "regular" clang, so we need to always push / pop there.
chris-eibl commentedMar 28, 2025
I am pretty sure that failing ofUbuntu (free-threading) / build and test (ubuntu-24.04) (pull_request) is unrelated to the PR. |
chris-eibl commentedJun 9, 2025
@zooba May I ask you for a review? |
Modules/socketmodule.c Outdated
| _Py_COMP_DIAG_POP | ||
| #endif /* HAVE_GETHOSTBYNAME_R */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
nit: Two space indents of preprocessor directives might be uncommon in CPython except when a line starts with#.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I indented everywhere by two spaces to easier spot the macros, but I will happily indent by four spaces if this is preferred.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I'd prefer to avoid thinking of the intention when reading, so +1 for four spaces.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Done. I had a look at the other occurrences in the code base: either no indentation or like the code they guard.
I switched to the latter.
zooba commentedJun 9, 2025
LGTM. I'll merge after CI is done unless something else comes up (or if someone else sees this and can merge, go ahead) |
cc8e6d2 intopython:mainUh oh!
There was an error while loading.Please reload this page.
Thanks@chris-eibl for the PR, and@zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14. |
…GH-131821)(cherry picked from commitcc8e6d2)Co-authored-by: Chris Eibl <138194463+chris-eibl@users.noreply.github.com>
GH-146339 is a backport of this pull request to the3.14 branch. |
Uh oh!
There was an error while loading.Please reload this page.
I think this is a skip news?