pull in the recent unconditionals merge from master

This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions

View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 wintty.h $Date$ $Revision$ */
/* NetHack 3.5 wintty.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 wintty.h $Date: 2012/01/23 10:45:26 $ $Revision: 1.12 $ */
/* Copyright (c) David Cohrs, 1991,1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -34,8 +35,8 @@ struct WinDesc {
/* maxcol is also used by WIN_MESSAGE for */
/* tracking the ^P command */
short *datlen; /* allocation size for *data */
nhwchar **data; /* window data [row][column] */
nhwchar *morestr; /* string to display instead of default */
char **data; /* window data [row][column] */
char *morestr; /* string to display instead of default */
tty_menu_item *mlist; /* menu information (MENU) */
tty_menu_item **plist; /* menu page pointers (MENU) */
short plist_size; /* size of allocated plist (MENU) */
@@ -87,7 +88,7 @@ extern struct WinDesc *wins[MAXWIN];
extern struct DisplayDesc *ttyDisplay; /* the tty display descriptor */
extern char morc; /* last character typed to xwaitforspace */
extern nhwchar defmorestr[]; /* default --more-- prompt */
extern char defmorestr[]; /* default --more-- prompt */
/* port specific external function references */
@@ -108,9 +109,7 @@ E void NDECL(tty_shutdown);
* actually would be expanded. So here, we have to make an exception. */
E void FDECL(xputc, (int));
#else
# ifndef WIN32CON
E void FDECL(xputc, (CHAR_P));
# endif
#endif
E void FDECL(xputs, (const char *));
#if defined(SCREEN_VGA) || defined(SCREEN_8514)
@@ -153,10 +152,10 @@ E int FDECL(has_color,(int color));
/* ### topl.c ### */
E void FDECL(addtopl, (const nhwchar *));
E void FDECL(addtopl, (const char *));
E void NDECL(more);
E void FDECL(update_topl, (const nhwchar *));
E void FDECL(putsyms, (const nhwchar *));
E void FDECL(update_topl, (const char *));
E void FDECL(putsyms, (const char*));
/* ### wintty.c ### */
#ifdef CLIPPING
@@ -166,9 +165,6 @@ E void FDECL(docorner, (int, int));
E void NDECL(end_glyphout);
E void FDECL(g_putch, (int));
E void FDECL(win_tty_init, (int));
#ifdef UNICODE_WIDEWINPORT
E void FDECL(u_putch, (nhwchar));
#endif
/* external declarations */
E void FDECL(tty_init_nhwindows, (int *, char **));