some tty updates
Add a note about NO_TERMS to include/wintty.h for clarity. Rename tty_startup and tty_shutdown to term_startup() and term_shutdown(). They are found in termcap.c for !NO_TERMS like most of the other term_ routines, as well as having versions for several of the NO_TERMS platforms. They aren't part of the tty_interface called from the core. The tty implementation does call and rely on them. Remove some conditional #ifdef's around term_shutdown() (formerly tty_shutdown()) and just ensure that all the tty platforms have an implementation that they can link with, even if it is just a stub presently. Put the protype for nethack_exit in extern.h to reduce maintenance to a single spot, and remove it from other locations. A warning in the msdos cross-compile led to this change.
This commit is contained in:
@@ -22,12 +22,6 @@
|
||||
#include <unistd.h> /* for getcwd() prototype */
|
||||
#endif
|
||||
|
||||
#if defined(MICRO) || defined(OS2)
|
||||
ATTRNORETURN void nethack_exit(int) NORETURN;
|
||||
#else
|
||||
#define nethack_exit exit
|
||||
#endif
|
||||
|
||||
char *exepath(char *);
|
||||
char orgdir[PATHLEN]; /* also used in pcsys.c, amidos.c */
|
||||
|
||||
|
||||
+1
-5
@@ -27,11 +27,6 @@
|
||||
#define filesize filesize_nh
|
||||
#endif
|
||||
|
||||
#if defined(MICRO) || defined(OS2)
|
||||
ATTRNORETURN void nethack_exit(int) NORETURN;
|
||||
#else
|
||||
#define nethack_exit exit
|
||||
#endif
|
||||
static void msexit(void);
|
||||
|
||||
#ifdef MOVERLAY
|
||||
@@ -276,6 +271,7 @@ msexit(void)
|
||||
restore_colors();
|
||||
#endif
|
||||
wait_synch();
|
||||
term_curs_set(1);
|
||||
return;
|
||||
}
|
||||
#endif /* MICRO || OS2 */
|
||||
|
||||
Reference in New Issue
Block a user