From b4bb3b92a2f2c288aea360ccda199ca5742d9353 Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 13 Nov 2023 15:00:44 -0500 Subject: [PATCH] replace E with extern in the last file like that --- include/wintty.h | 203 +++++++++++++++++++++++------------------------ 1 file changed, 100 insertions(+), 103 deletions(-) diff --git a/include/wintty.h b/include/wintty.h index 96ca71eff..fbb6a6763 100644 --- a/include/wintty.h +++ b/include/wintty.h @@ -5,8 +5,6 @@ #ifndef WINTTY_H #define WINTTY_H -#define E extern - #ifndef WINDOW_STRUCTS #define WINDOW_STRUCTS @@ -147,35 +145,35 @@ extern char defmorestr[]; /* default --more-- prompt */ /* port specific external function references */ /* ### getline.c ### */ -E void xwaitforspace(const char *); +extern void xwaitforspace(const char *); /* ### termcap.c, video.c ### */ -E void tty_startup(int *, int *); +extern void tty_startup(int *, int *); #ifndef NO_TERMS -E void tty_shutdown(void); +extern void tty_shutdown(void); #endif -E int xputc(int); -E void xputs(const char *); +extern int xputc(int); +extern void xputs(const char *); #if defined(SCREEN_VGA) || defined(SCREEN_8514) || defined(SCREEN_VESA) -E void xputg(const glyph_info *, const glyph_info *); +extern void xputg(const glyph_info *, const glyph_info *); #endif -E void cl_end(void); -E void term_clear_screen(void); -E void home(void); -E void standoutbeg(void); -E void standoutend(void); +extern void cl_end(void); +extern void term_clear_screen(void); +extern void home(void); +extern void standoutbeg(void); +extern void standoutend(void); #if 0 -E void revbeg(void); -E void boldbeg(void); -E void blinkbeg(void); -E void dimbeg(void); -E void m_end(void); +extern void revbeg(void); +extern void boldbeg(void); +extern void blinkbeg(void); +extern void dimbeg(void); +extern void m_end(void); #endif -E void backsp(void); -E void graph_on(void); -E void graph_off(void); -E void cl_eos(void); +extern void backsp(void); +extern void graph_on(void); +extern void graph_off(void); +extern void cl_eos(void); /* * termcap.c (or facsimiles in other ports) is the right place for doing @@ -183,16 +181,16 @@ E void cl_eos(void); * a color or whatever. wintty.c should concern itself with WHERE to put * stuff in a window. */ -E int term_attr_fixup(int); -E void term_start_attr(int attr); -E void term_end_attr(int attr); -E void term_start_raw_bold(void); -E void term_end_raw_bold(void); +extern int term_attr_fixup(int); +extern void term_start_attr(int attr); +extern void term_end_attr(int attr); +extern void term_start_raw_bold(void); +extern void term_end_raw_bold(void); #ifdef TEXTCOLOR -E void term_end_color(void); -E void term_start_color(int color); -E void term_start_bgcolor(int color); +extern void term_end_color(void); +extern void term_start_color(int color); +extern void term_start_bgcolor(int color); #endif /* TEXTCOLOR */ #ifdef ENHANCED_SYMBOLS extern void term_start_24bitcolor(struct unicode_representation *); @@ -201,98 +199,99 @@ extern void term_end_24bitcolor(void); /* termcap.c, consoletty.c */ /* ### topl.c ### */ -E void show_topl(const char *); -E void remember_topl(void); -E void addtopl(const char *); -E void more(void); -E void update_topl(const char *); -E void putsyms(const char *); +extern void show_topl(const char *); +extern void remember_topl(void); +extern void addtopl(const char *); +extern void more(void); +extern void update_topl(const char *); +extern void putsyms(const char *); /* ### wintty.c ### */ #ifdef CLIPPING -E void setclipped(void); +extern void setclipped(void); #endif -E void docorner(int, int, int); -E void end_glyphout(void); -E void g_putch(int); +extern void docorner(int, int, int); +extern void end_glyphout(void); +extern void g_putch(int); #ifdef ENHANCED_SYMBOLS #if defined(WIN32) || defined(UNIX) -E void g_pututf8(uint8 *); +extern void g_pututf8(uint8 *); #endif #endif /* ENHANCED_SYMBOLS */ extern void erase_tty_screen(void); -E void win_tty_init(int); +extern void win_tty_init(int); /* external declarations */ -E void tty_init_nhwindows(int *, char **); -E void tty_preference_update(const char *); -E void tty_player_selection(void); -E void tty_askname(void); -E void tty_get_nh_event(void); -E void tty_exit_nhwindows(const char *); -E void tty_suspend_nhwindows(const char *); -E void tty_resume_nhwindows(void); -E winid tty_create_nhwindow(int); -E void tty_clear_nhwindow(winid); -E void tty_display_nhwindow(winid, boolean); -E void tty_dismiss_nhwindow(winid); -E void tty_destroy_nhwindow(winid); -E void tty_curs(winid, int, int); -E void tty_putstr(winid, int, const char *); -E void tty_putmixed(winid window, int attr, const char *str); -E void tty_display_file(const char *, boolean); -E void tty_start_menu(winid, unsigned long); -E void tty_add_menu(winid, const glyph_info *, const ANY_P *, char, char, - int, int, const char *, unsigned int); -E void tty_end_menu(winid, const char *); -E int tty_select_menu(winid, int, MENU_ITEM_P **); -E char tty_message_menu(char, int, const char *); -E void tty_mark_synch(void); -E void tty_wait_synch(void); +extern void tty_init_nhwindows(int *, char **); +extern void tty_preference_update(const char *); +extern void tty_player_selection(void); +extern void tty_askname(void); +extern void tty_get_nh_event(void); +extern void tty_exit_nhwindows(const char *); +extern void tty_suspend_nhwindows(const char *); +extern void tty_resume_nhwindows(void); +extern winid tty_create_nhwindow(int); +extern void tty_clear_nhwindow(winid); +extern void tty_display_nhwindow(winid, boolean); +extern void tty_dismiss_nhwindow(winid); +extern void tty_destroy_nhwindow(winid); +extern void tty_curs(winid, int, int); +extern void tty_putstr(winid, int, const char *); +extern void tty_putmixed(winid window, int attr, const char *str); +extern void tty_display_file(const char *, boolean); +extern void tty_start_menu(winid, unsigned long); +extern void tty_add_menu(winid, const glyph_info *, const ANY_P *, char, + char, int, int, const char *, unsigned int); +extern void tty_end_menu(winid, const char *); +extern int tty_select_menu(winid, int, MENU_ITEM_P **); +extern char tty_message_menu(char, int, const char *); +extern void tty_mark_synch(void); +extern void tty_wait_synch(void); #ifdef CLIPPING -E void tty_cliparound(int, int); +extern void tty_cliparound(int, int); #endif #ifdef POSITIONBAR -E void tty_update_positionbar(char *); +extern void tty_update_positionbar(char *); #endif -E void tty_print_glyph(winid, coordxy, coordxy, const glyph_info *, - const glyph_info *); -E void tty_raw_print(const char *); -E void tty_raw_print_bold(const char *); -E int tty_nhgetch(void); -E int tty_nh_poskey(coordxy *, coordxy *, int *); -E void tty_nhbell(void); -E int tty_doprev_message(void); -E char tty_yn_function(const char *, const char *, char); -E void tty_getlin(const char *, char *); -E int tty_get_ext_cmd(void); -E void tty_number_pad(int); -E void tty_delay_output(void); +extern void tty_print_glyph(winid, coordxy, coordxy, const glyph_info *, + const glyph_info *); +extern void tty_raw_print(const char *); +extern void tty_raw_print_bold(const char *); +extern int tty_nhgetch(void); +extern int tty_nh_poskey(coordxy *, coordxy *, int *); +extern void tty_nhbell(void); +extern int tty_doprev_message(void); +extern char tty_yn_function(const char *, const char *, char); +extern void tty_getlin(const char *, char *); +extern int tty_get_ext_cmd(void); +extern void tty_number_pad(int); +extern void tty_delay_output(void); #ifdef CHANGE_COLOR -E void tty_change_color(int color, long rgb, int reverse); +extern void tty_change_color(int color, long rgb, int reverse); #ifdef MAC -E void tty_change_background(int white_or_black); -E short set_tty_font_name(winid, char *); +extern void tty_change_background(int white_or_black); +extern short set_tty_font_name(winid, char *); #endif -E char *tty_get_color_string(void); +extern char *tty_get_color_string(void); #endif -E void tty_status_enablefield(int, const char *, const char *, boolean); -E void tty_status_init(void); -E void tty_status_update(int, genericptr_t, int, int, int, unsigned long *); +extern void tty_status_enablefield(int, const char *, const char *, boolean); +extern void tty_status_init(void); +extern void tty_status_update(int, genericptr_t, int, int, + int, unsigned long *); /* other defs that really should go away (they're tty specific) */ -E void tty_start_screen(void); -E void tty_end_screen(void); +extern void tty_start_screen(void); +extern void tty_end_screen(void); -E void genl_outrip(winid, int, time_t); +extern void genl_outrip(winid, int, time_t); -E char *tty_getmsghistory(boolean); -E void tty_putmsghistory(const char *, boolean); -E void tty_update_inventory(int); -E win_request_info *tty_ctrl_nhwindow(winid, int, win_request_info *); +extern char *tty_getmsghistory(boolean); +extern void tty_putmsghistory(const char *, boolean); +extern void tty_update_inventory(int); +extern win_request_info *tty_ctrl_nhwindow(winid, int, win_request_info *); #ifdef TTY_PERM_INVENT -E void tty_refresh_inventory(int start, int stop, int y); +extern void tty_refresh_inventory(int start, int stop, int y); #endif /* termcap is implied if NO_TERMS is not defined */ @@ -332,9 +331,9 @@ extern char *tgoto(const char *, int, int); #define putchar term_putc #define fflush term_flush #define puts term_puts -E int term_putc(int c); -E int term_flush(void *desc); -E int term_puts(const char *str); +extern int term_putc(int c); +extern int term_flush(void *desc); +extern int term_puts(const char *str); #endif /* MAC */ #if defined(MSDOS) || defined(WIN32) #if defined(SCREEN_BIOS) || defined(SCREEN_DJGPPFAST) || defined(WIN32) @@ -346,11 +345,9 @@ E int term_puts(const char *str); #define puts(x) xputs(x) #endif /*SCREEN_BIOS || SCREEN_DJGPPFAST || WIN32 */ #ifdef POSITIONBAR -E void video_update_positionbar(char *); +extern void video_update_positionbar(char *); #endif #endif /*MSDOS*/ #endif /* NO_TERMS */ -#undef E - #endif /* WINTTY_H */