diff --git a/pkg/urbit/daemon/main.c b/pkg/urbit/daemon/main.c index 13bd0dbb28..7727b5d740 100644 --- a/pkg/urbit/daemon/main.c +++ b/pkg/urbit/daemon/main.c @@ -542,7 +542,7 @@ _cw_usage(c3_c* s) " %s queu cue state:\n" "\n run as a 'serf':\n" " %s serf " -#ifdef U3_OS_mingw +#if defined(U3_OS_mingw) && defined(U3_INTERRUPT_EVENT) " " #endif "\n", @@ -847,7 +847,7 @@ _cw_serf_commence(c3_i argc, c3_c* argv[]) c3_i inn_i, out_i; _cw_serf_stdio(&inn_i, &out_i); - #if defined(U3_OS_mingw) +#if defined(U3_OS_mingw) && defined(U3_INTERRUPT_EVENT) c3_assert( 8 == argc ); // Initialize serf's end of Ctrl-C handling @@ -861,9 +861,9 @@ _cw_serf_commence(c3_i argc, c3_c* argv[]) fprintf(stderr, "serf: Ctrl-C event: RegisterWaitForSingleObject(%u) failed (%d)\r\n", h, GetLastError()); } } - #else +#else c3_assert( 7 == argc ); - #endif +#endif uv_loop_t* lup_u = uv_default_loop(); c3_c* dir_c = argv[2]; @@ -1335,7 +1335,7 @@ main(c3_i argc, } } - #if defined(U3_OS_mingw) +#if defined(U3_OS_mingw) && defined(U3_INTERRUPT_EVENT) // Initialize event used to transmit Ctrl-C to worker process // { @@ -1345,7 +1345,7 @@ main(c3_i argc, exit(1); } } - #endif +#endif // starting u3m configures OpenSSL memory functions, so we must do it // before any OpenSSL allocations diff --git a/pkg/urbit/vere/king.c b/pkg/urbit/vere/king.c index 88190017b0..3fb187aa0f 100644 --- a/pkg/urbit/vere/king.c +++ b/pkg/urbit/vere/king.c @@ -603,9 +603,9 @@ _king_sign_cb(uv_signal_t* sil_u, c3_i num_i) u3l_log("\r\ninterrupt\r\n"); u3_term_ef_ctlc(); - #if defined(U3_OS_mingw) +#if defined(U3_OS_mingw) && defined(U3_INTERRUPT_EVENT) PulseEvent(u3_Host.cev_u); - #endif +#endif break; } diff --git a/pkg/urbit/vere/lord.c b/pkg/urbit/vere/lord.c index 3428a1ff38..961f964b36 100644 --- a/pkg/urbit/vere/lord.c +++ b/pkg/urbit/vere/lord.c @@ -1190,13 +1190,13 @@ u3_lord_init(c3_c* pax_c, c3_w wag_w, c3_d key_d[4], u3_lord_cb cb_u) arg_c[6] = "0"; } - #if defined(U3_OS_mingw) +#if defined(U3_OS_mingw) && defined(U3_INTERRUPT_EVENT) sprintf(cev_c, "%u", u3_Host.cev_u); arg_c[7] = cev_c; arg_c[8] = 0; - #else +#else arg_c[7] = 0; - #endif +#endif uv_pipe_init(u3L, &god_u->inn_u.pyp_u, 0); uv_timer_init(u3L, &god_u->out_u.tim_u);