romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 23:03:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

servers: drop redundant guards on Windows

Browse source 
These `SIG*` macro are provided by all supported Windows toolchains.

Cherry-picked from #22487

Closes #22493
This commit is contained in:
Viktor Szakats 2026-08-05 14:40:35 +02:00
parent b260e9f841
commit 947ae0e0cc
No known key found for this signature in database
1 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/server/util.c
View file

@ -348,7 +348,7 @@ static SIGHANDLER_T old_sigint_handler = SIG_ERR;
#ifdef SIGTERM
static SIGHANDLER_T old_sigterm_handler = SIG_ERR;
#endif
#if defined(SIGBREAK) && defined(_WIN32)
#ifdef _WIN32
static SIGHANDLER_T old_sigbreak_handler = SIG_ERR;
#endif
@ -444,21 +444,15 @@ static BOOL WINAPI ctrl_event_handler(DWORD dwCtrlType)
int signum = 0;
logmsg("ctrl_event_handler: %lu", dwCtrlType);
switch(dwCtrlType) {
#ifdef SIGINT
case CTRL_C_EVENT:
signum = SIGINT;
break;
#endif
#ifdef SIGTERM
case CTRL_CLOSE_EVENT:
signum = SIGTERM;
break;
#endif
#ifdef SIGBREAK
case CTRL_BREAK_EVENT:
signum = SIGBREAK;
break;
#endif
default:
return FALSE;
}
@ -484,11 +478,9 @@ static LRESULT CALLBACK main_window_proc(HWND hwnd, UINT uMsg,
int signum = 0;
if(hwnd == hidden_main_window) {
switch(uMsg) {
#ifdef SIGTERM
case WM_CLOSE:
signum = SIGTERM;
break;
#endif
case WM_DESTROY:
PostQuitMessage(0);
break;
@ -636,14 +628,12 @@ void install_signal_handlers(bool keep_sigalrm)
logmsg("cannot install SIGTERM handler: (%d) %s",
errno, curlx_strerror(errno, errbuf, sizeof(errbuf)));
#endif
#if defined(SIGBREAK) && defined(_WIN32)
#ifdef _WIN32
/* handle SIGBREAK signal with our exit_signal_handler */
old_sigbreak_handler = set_signal(SIGBREAK, exit_signal_handler, 1);
if(old_sigbreak_handler == SIG_ERR)
logmsg("cannot install SIGBREAK handler: (%d) %s",
errno, curlx_strerror(errno, errbuf, sizeof(errbuf)));
#endif
#ifdef _WIN32
if(!SetConsoleCtrlHandler(ctrl_event_handler, TRUE))
logmsg("cannot install CTRL event handler");
@ -682,11 +672,9 @@ void restore_signal_handlers(bool keep_sigalrm)
if(old_sigterm_handler != SIG_ERR)
(void)set_signal(SIGTERM, old_sigterm_handler, 0);
#endif
#if defined(SIGBREAK) && defined(_WIN32)
#ifdef _WIN32
if(old_sigbreak_handler != SIG_ERR)
(void)set_signal(SIGBREAK, old_sigbreak_handler, 0);
#endif
#ifdef _WIN32
(void)SetConsoleCtrlHandler(ctrl_event_handler, FALSE);
#ifndef CURL_WINDOWS_UWP
if(thread_main_window && thread_main_id) {