folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into AutoConfigure

Browse source
This commit is contained in:
Mark Pizzolato 2012-12-20 14:06:17 -08:00
commit 01eb95167a
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Ibm1130/ibm1130_stddev.c
View file

@ -340,7 +340,7 @@ t_stat emit_conout_character (int ch)
return map_conout_character(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); 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)) { if ((tti_unit.flags & KEYBOARD_LOCKED) || ! (tti_dsw & TT_DSW_KEYBOARD_BUSY)) {
Beep(); SendBeep();
return SCPE_OK; return SCPE_OK;
} }
@ -403,7 +403,7 @@ static t_stat tti_svc (UNIT *uptr)
temp = ascii_to_conin[temp]; temp = ascii_to_conin[temp];
if (temp == 0) { /* ignore invalid characters */ if (temp == 0) { /* ignore invalid characters */
Beep(); SendBeep();
calc_ints(); calc_ints();
return SCPE_OK; return SCPE_OK;
} }

2
makefile
View file

@ -336,7 +336,7 @@ else
MKDIRBIN = if not exist BIN mkdir BIN MKDIRBIN = if not exist BIN mkdir BIN
endif endif
ifneq ($(USE_NETWORK),) ifneq ($(USE_NETWORK),)
NETWORK_OPT = -DUSE_SHARED NETWORK_OPT += -DUSE_SHARED
endif endif
endif endif
ifneq ($(DEBUG),) ifneq ($(DEBUG),)

3
sim_defs.h
View file

@ -659,6 +659,9 @@ extern int32 sim_asynch_inst_latency;
/* which avoids the potential ABA issues. */ /* which avoids the potential ABA issues. */
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#ifdef PACKED
#undef PACKED
#endif /* PACKED */
#ifdef ERROR #ifdef ERROR
#undef ERROR #undef ERROR
#endif /* ERROR */ #endif /* ERROR */