1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00

Merge recent misc fixes from 'pre-0.77'.

This commit is contained in:
Jacob Nevins 2022-05-19 23:25:20 +01:00
commit aa82865f53
2 changed files with 8 additions and 3 deletions

View File

@ -4,8 +4,8 @@
# give a #error if this manoeuvre doesn't do what it needs to. # give a #error if this manoeuvre doesn't do what it needs to.
string(REPLACE "/DNDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") string(REPLACE "/DNDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
string(REPLACE "/DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE}") string(REPLACE "/DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE}") string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
set(PUTTY_IPV6 ON set(PUTTY_IPV6 ON
CACHE BOOL "Build PuTTY with IPv6 support if possible") CACHE BOOL "Build PuTTY with IPv6 support if possible")

View File

@ -2074,7 +2074,7 @@ static bool is_alt_pressed(void)
static bool resizing; static bool resizing;
static void win_seat_notify_remote_exit(Seat *seat) static void exit_callback(void *vctx)
{ {
int exitcode, close_on_exit; int exitcode, close_on_exit;
@ -2101,6 +2101,11 @@ static void win_seat_notify_remote_exit(Seat *seat)
} }
} }
static void win_seat_notify_remote_exit(Seat *seat)
{
queue_toplevel_callback(exit_callback, NULL);
}
void timer_change_notify(unsigned long next) void timer_change_notify(unsigned long next)
{ {
unsigned long now = GETTICKCOUNT(); unsigned long now = GETTICKCOUNT();