Skip to content

Conversation

@ericsnowcurrently
Copy link
Member

@ericsnowcurrentlyericsnowcurrently commented Dec 7, 2022

@netlify
Copy link

netlifybot commented Dec 7, 2022

Deploy Preview for python-cpython-preview canceled.

NameLink
🔨 Latest commit38596a0
🔍 Latest deploy loghttps://app.netlify.com/sites/python-cpython-preview/deploys/6397b5e1a4ac130008314bbc

@ericsnowcurrentlyericsnowcurrentlyforce-pushed the consolidate-signal-globals branch 2 times, most recently from b8ae626 to 3b416b1CompareDecember 8, 2022 23:45
@ericsnowcurrentlyericsnowcurrently requested a review from a team as a code ownerDecember 9, 2022 00:15
@ericsnowcurrentlyericsnowcurrentlyforce-pushed the consolidate-signal-globals branch 2 times, most recently from 5cd67d8 to c1ac129CompareDecember 9, 2022 17:04
Comment on lines 15 to 24
#ifdefMS_WINDOWS
# ifdefPYCORE_SIGNAL_WITH_PRE_INCLUDES
# ifndefSOCKET
# error "<winsock2.h> must be included before this header"
# endif
# ifndefHANDLE
# error "<windows.h> must be included before this header"
# endif
# endif
#endif
Copy link
MemberAuthor

Choose a reason for hiding this comment

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

@zooba, did I do this right? This is how I understood your recommendation.

Copy link
Member

Choose a reason for hiding this comment

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

I don't think you want PYCORE_SIGNAL_WITH_PRE_INCLUDES in there. The header file is simply wrong if the system headers haven't been included, so it should always fail.

If the header needs to be used somewhere else, then that somewhere else also needs to include the headers. Alternatively, if it doesn't need to use the values (but just be able to allocate the structures), replace the SOCKET and HANDLE types entirely with void * and do casts anywhere they're actually being used.

@ericsnowcurrentlyericsnowcurrently removed the request for review from a teamDecember 12, 2022 18:45
@ericsnowcurrentlyericsnowcurrently merged commit 5eb28bc into python:mainDec 12, 2022
@ericsnowcurrentlyericsnowcurrently deleted the consolidate-signal-globals branch December 12, 2022 23:50
carljm added a commit to carljm/cpython that referenced this pull request Dec 14, 2022
* main: (103 commits) pythongh-100248: Add missing `ssl_shutdown_timeout` parameter in `asyncio` docs (python#100249) Assorted minor fixes for specialization stats. (pythonGH-100219) pythongh-100176: venv: Remove redundant compat code for Python <= 3.2 (python#100177) pythonGH-100222: Redefine _Py_CODEUNIT as a union to clarify structure of code unit. (pythonGH-100223) pythongh-99955: undef ERROR and SUCCESS before redefining (fixes sanitizer warning) (python#100215) pythonGH-100206: use versionadded for the addition of sysconfig.get_default_scheme (python#100207) pythongh-81057: Move _Py_RefTotal to the "Ignored Globals" List (pythongh-100203) pythongh-81057: Move Signal-Related Globals to _PyRuntimeState (pythongh-100085) pythongh-81057: Move faulthandler Globals to _PyRuntimeState (pythongh-100152) pythongh-81057: Move tracemalloc Globals to _PyRuntimeState (pythongh-100151) pythonGH-100143: Improve collecting pystats for parts of runs (pythonGH-100144) pythongh-99955: standardize return values of functions in compiler's code-gen (python#100010) pythongh-79218: Define `MS_WIN64` macro for Mingw-w64 64bit on Windows (pythonGH-100137) Fix: typo (Indention) (pythonGH-99904) pythongh-96715 Remove redundant NULL check in `profile_trampoline` function (python#96716) pythongh-100176: remove incorrect version compatibility check from argument clinic (python#100190) clarify the 4300-digit limit on int-str conversion (python#100175) pythongh-70393: Clarify mention of "middle" scope (python#98839) pythongh-99688: Fix outdated tests in test_unary (python#99712) pythongh-100174: [Enum] Correct PowersOfThree example. (pythonGH-100178) ...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@ericsnowcurrently@zooba@bedevere-bot