diff --git a/Ibm1130/ibm1130_stddev.c b/Ibm1130/ibm1130_stddev.c index d71d45b4..d596fb07 100644 --- a/Ibm1130/ibm1130_stddev.c +++ b/Ibm1130/ibm1130_stddev.c @@ -340,7 +340,7 @@ t_stat emit_conout_character (int ch) return map_conout_character(ch); } -static void Beep (void) /* notify user keyboard was locked or key was bad */ +static void SendBeep (void) /* notify user keyboard was locked or key was bad */ { sim_putchar(7); } @@ -395,7 +395,7 @@ static t_stat tti_svc (UNIT *uptr) } if ((tti_unit.flags & KEYBOARD_LOCKED) || ! (tti_dsw & TT_DSW_KEYBOARD_BUSY)) { - Beep(); + SendBeep(); return SCPE_OK; } @@ -403,7 +403,7 @@ static t_stat tti_svc (UNIT *uptr) temp = ascii_to_conin[temp]; if (temp == 0) { /* ignore invalid characters */ - Beep(); + SendBeep(); calc_ints(); return SCPE_OK; } diff --git a/makefile b/makefile index 3bfcf389..076993b0 100644 --- a/makefile +++ b/makefile @@ -336,7 +336,7 @@ else MKDIRBIN = if not exist BIN mkdir BIN endif ifneq ($(USE_NETWORK),) - NETWORK_OPT = -DUSE_SHARED + NETWORK_OPT += -DUSE_SHARED endif endif ifneq ($(DEBUG),) diff --git a/sim_defs.h b/sim_defs.h index ebca45ed..7ad0132c 100644 --- a/sim_defs.h +++ b/sim_defs.h @@ -659,6 +659,9 @@ extern int32 sim_asynch_inst_latency; /* which avoids the potential ABA issues. */ #ifdef _WIN32 #include +#ifdef PACKED +#undef PACKED +#endif /* PACKED */ #ifdef ERROR #undef ERROR #endif /* ERROR */