From: Pasi Kallinen Date: Sat, 19 Aug 2017 11:10:29 +0000 (+0300) Subject: Rename terminate to nh_terminate so VS2015 can compile X-Git-Tag: NetHack-3.6.1_RC01~417 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=189809a55ce26b676607d7d9e35ccfa16b6bad6d;p=nethack Rename terminate to nh_terminate so VS2015 can compile --- diff --git a/include/extern.h b/include/extern.h index 1d44d0d37..18c3dabbc 100644 --- a/include/extern.h +++ b/include/extern.h @@ -666,7 +666,7 @@ E void VDECL(panic, (const char *, ...)) PRINTF_F(1, 2) NORETURN; E void FDECL(done, (int)); E void FDECL(container_contents, (struct obj *, BOOLEAN_P, BOOLEAN_P, BOOLEAN_P)); -E void FDECL(terminate, (int)) NORETURN; +E void FDECL(nh_terminate, (int)) NORETURN; E int NDECL(dovanquished); E int NDECL(num_genocides); E void FDECL(delayed_killer, (int, int, const char *)); diff --git a/src/cmd.c b/src/cmd.c index cd7faedc8..7437242dd 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -4965,7 +4965,7 @@ end_of_input() if (iflags.window_inited) exit_nhwindows((char *) 0); clearlocks(); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); /*NOTREACHED*/ /* not necessarily true for vms... */ return; } diff --git a/src/dungeon.c b/src/dungeon.c index 5b5e7c369..e9b6245b7 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -247,7 +247,7 @@ dlb *stream; panic( "Premature EOF on dungeon description file!\r\nExpected %d bytes - got %d.", (size * nitems), (size * cnt)); - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); } } diff --git a/src/end.c b/src/end.c index b4f779cf2..3344f5771 100644 --- a/src/end.c +++ b/src/end.c @@ -1457,7 +1457,7 @@ int how; raw_print(""); raw_print(""); } - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); } void @@ -1532,7 +1532,7 @@ boolean identified, all_containers, reportempty; /* should be called with either EXIT_SUCCESS or EXIT_FAILURE */ void -terminate(status) +nh_terminate(status) int status; { program_state.in_moveloop = 0; /* won't be returning to normal play */ @@ -1549,7 +1549,7 @@ int status; #ifdef VMS /* * This is liable to draw a warning if compiled with gcc, but it's - * more important to flag panic() -> really_done() -> terminate() + * more important to flag panic() -> really_done() -> nh_terminate() * as __noreturn__ then to avoid the warning. */ /* don't call exit() if already executing within an exit handler; diff --git a/src/files.c b/src/files.c index 49de94a36..1c55133cb 100644 --- a/src/files.c +++ b/src/files.c @@ -1205,7 +1205,7 @@ boolean uncomp; if (freopen(filename, mode, stream) == (FILE *) 0) { (void) fprintf(stderr, "freopen of %s for %scompress failed\n", filename, uncomp ? "un" : ""); - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); } } @@ -1311,7 +1311,7 @@ boolean uncomp; perror((char *) 0); (void) fprintf(stderr, "Exec to %scompress %s failed.\n", uncomp ? "un" : "", filename); - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); } else if (f == -1) { perror((char *) 0); pline("Fork to %scompress %s failed.", uncomp ? "un" : "", filename); diff --git a/src/mail.c b/src/mail.c index 946f81634..9d8986db9 100644 --- a/src/mail.c +++ b/src/mail.c @@ -641,7 +641,7 @@ struct obj *otmp UNUSED; if (child(1)) { (void) execl(mr, mr, (char *) 0); - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); } #else #ifndef AMS /* AMS mailboxes are directories */ diff --git a/src/options.c b/src/options.c index 0bfacc09d..0d9d81468 100644 --- a/src/options.c +++ b/src/options.c @@ -641,7 +641,7 @@ initoptions() /* ... and _must_ parse correctly. */ if (!read_config_file(SYSCF_FILE, SET_IN_SYS)) { raw_printf("Error(s) found in SYSCF_FILE, quitting."); - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); } /* * TODO [maybe]: parse the sysopt entries which are space-separated diff --git a/src/pline.c b/src/pline.c index 07e55e679..270272042 100644 --- a/src/pline.c +++ b/src/pline.c @@ -469,7 +469,7 @@ const char *line; (void) execv(args[0], (char *const *) args); perror((char *) 0); (void) fprintf(stderr, "Exec to message handler %s failed.\n", env); - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); } else if (f > 0) { int status; diff --git a/src/restore.c b/src/restore.c index 509ff6ed9..7d83575dc 100644 --- a/src/restore.c +++ b/src/restore.c @@ -744,7 +744,7 @@ xchar ltmp; } #endif /* ?AMIGA */ pline("Be seeing you..."); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); } #endif /* MFLOPPY */ bufon(nfd); diff --git a/src/save.c b/src/save.c index 5270cc657..fdbe0a22c 100644 --- a/src/save.c +++ b/src/save.c @@ -94,7 +94,7 @@ dosave() /* make sure they see the Saving message */ display_nhwindow(WIN_MESSAGE, TRUE); exit_nhwindows("Be seeing you..."); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); } else (void) doredraw(); } @@ -725,7 +725,7 @@ register unsigned num; if (failed) { #if defined(UNIX) || defined(VMS) || defined(__EMX__) if (program_state.done_hup) - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); else #endif panic("cannot write %u bytes to file #%d", num, fd); @@ -831,7 +831,7 @@ register int fd; if (write(fd, outbuf, outbufp) != outbufp) { #if defined(UNIX) || defined(VMS) || defined(__EMX__) if (program_state.done_hup) - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); else #endif zerocomp_bclose(fd); /* panic (outbufp != 0) */ @@ -857,7 +857,7 @@ register unsigned num; if ((unsigned) write(fd, loc, num) != num) { #if defined(UNIX) || defined(VMS) || defined(__EMX__) if (program_state.done_hup) - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); else #endif panic("cannot write %u bytes to file #%d", num, fd); diff --git a/src/windows.c b/src/windows.c index 55678a0b4..5328817c8 100644 --- a/src/windows.c +++ b/src/windows.c @@ -240,7 +240,7 @@ const char *s; } if (windowprocs.win_raw_print == def_raw_print) - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); wait_synch(); } diff --git a/sys/amiga/winami.c b/sys/amiga/winami.c index daabd859d..58d4165da 100644 --- a/sys/amiga/winami.c +++ b/sys/amiga/winami.c @@ -436,7 +436,7 @@ amii_askname() if (*plname == '\33') { clearlocks(); exit_nhwindows(NULL); - terminate(0); + nh_terminate(0); } } @@ -543,7 +543,7 @@ amii_player_selection() CloseShWindow( cwin ); clearlocks(); exit_nhwindows(NULL); - terminate(0); + nh_terminate(0); } else DisplayBeep( NULL ); @@ -573,7 +573,7 @@ amii_player_selection() CloseShWindow( cwin ); clearlocks(); exit_nhwindows(NULL); - terminate(0); + nh_terminate(0); break; } } @@ -1368,7 +1368,7 @@ amii_player_selection() free((genericptr_t) selected); clearlocks(); exit_nhwindows(NULL); - terminate(0); + nh_terminate(0); /*NOTREACHED*/ return; } diff --git a/sys/wince/mhmain.c b/sys/wince/mhmain.c index 58af9f7dd..98abd0177 100644 --- a/sys/wince/mhmain.c +++ b/sys/wince/mhmain.c @@ -487,7 +487,7 @@ MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) hangup(1); #else dosave0(); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); #endif } return 0; @@ -503,7 +503,7 @@ MainWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) free((PNHMainWindow) GetWindowLong(hWnd, GWL_USERDATA)); SetWindowLong(hWnd, GWL_USERDATA, (LONG) 0); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); } break; /*-----------------------------------------------------------------------*/ diff --git a/sys/wince/mswproc.c b/sys/wince/mswproc.c index 5a0ff989d..500306875 100644 --- a/sys/wince/mswproc.c +++ b/sys/wince/mswproc.c @@ -680,7 +680,7 @@ mswin_exit_nhwindows(const char *str) // Don't do any of this (?) - exit_nhwindows does not terminate // the application // DestroyWindow(GetNHApp()->hMainWnd); - // terminate(EXIT_SUCCESS); + // nh_terminate(EXIT_SUCCESS); } /* Prepare the window to be suspended. */ @@ -1726,7 +1726,7 @@ bail(const char *mesg) { clearlocks(); mswin_exit_nhwindows(mesg); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); /*NOTREACHED*/ } diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp index db995f7ea..52c925ae6 100644 --- a/win/Qt/qt_win.cpp +++ b/win/Qt/qt_win.cpp @@ -4039,7 +4039,7 @@ void NetHackQtMainWindow::closeEvent(QCloseEvent* e) if (dosave0()) { u.uhp = -1; NetHackQtBind::qt_exit_nhwindows(0); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); } break; case 1: @@ -4639,7 +4639,7 @@ void NetHackQtBind::qt_askname() // Quit clearlocks(); qt_exit_nhwindows(0); - terminate(0); + nh_terminate(0); } void NetHackQtBind::qt_get_nh_event() diff --git a/win/X11/winmisc.c b/win/X11/winmisc.c index b96902588..7f71b0ca3 100644 --- a/win/X11/winmisc.c +++ b/win/X11/winmisc.c @@ -370,7 +370,7 @@ X11_player_selection() if (ps_selected == PS_QUIT || program_state.done_hup) { clearlocks(); X11_exit_nhwindows((char *) 0); - terminate(0); + nh_terminate(0); } else if (ps_selected == PS_RANDOM) { flags.initrole = ROLE_RANDOM; } else if (ps_selected < 0 || ps_selected >= num_roles) { @@ -439,7 +439,7 @@ X11_player_selection() if (ps_selected == PS_QUIT || program_state.done_hup) { clearlocks(); X11_exit_nhwindows((char *) 0); - terminate(0); + nh_terminate(0); } else if (ps_selected == PS_RANDOM) { flags.initrace = ROLE_RANDOM; } else if (ps_selected < 0 || ps_selected >= num_races) { @@ -507,7 +507,7 @@ X11_player_selection() if (ps_selected == PS_QUIT || program_state.done_hup) { clearlocks(); X11_exit_nhwindows((char *) 0); - terminate(0); + nh_terminate(0); } else if (ps_selected == PS_RANDOM) { flags.initgend = ROLE_RANDOM; } else if (ps_selected < 0 || ps_selected >= num_gends) { @@ -573,7 +573,7 @@ X11_player_selection() if (ps_selected == PS_QUIT || program_state.done_hup) { clearlocks(); X11_exit_nhwindows((char *) 0); - terminate(0); + nh_terminate(0); } else if (ps_selected == PS_RANDOM) { flags.initalign = ROLE_RANDOM; } else if (ps_selected < 0 || ps_selected >= num_algns) { diff --git a/win/gem/wingem.c b/win/gem/wingem.c index 1d059eed0..72daffd14 100644 --- a/win/gem/wingem.c +++ b/win/gem/wingem.c @@ -129,7 +129,7 @@ const char *mesg; { clearlocks(); Gem_exit_nhwindows(mesg); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); /*NOTREACHED*/ } diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 3ac407a56..7e504d669 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -221,7 +221,7 @@ const char *mesg; { clearlocks(); tty_exit_nhwindows(mesg); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); /*NOTREACHED*/ } @@ -2663,7 +2663,7 @@ boolean complain; } if (complain) sleep(10); /* want to wait_synch() but stdin is gone */ - terminate(EXIT_FAILURE); + nh_terminate(EXIT_FAILURE); } (void) close(fd); #ifdef notyet diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index fe3ce07b5..9f4e0103c 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -2067,7 +2067,7 @@ bail(const char *mesg) { clearlocks(); mswin_exit_nhwindows(mesg); - terminate(EXIT_SUCCESS); + nh_terminate(EXIT_SUCCESS); /*NOTREACHED*/ }