no quotes in WINDOWPORT macro invocation

diff --git a/include/winprocs.h b/include/winprocs.h
index d1ae52c2773a29b52c0193136e5f1a6bc59b9821..85432fad593bc05545e7cbb4bda6597bd53dbef6 100644 (file)
--- a/include/winprocs.h
+++ b/include/winprocs.h
@@ -279,7 +279,7 @@ struct wc_Opt {
 /* Macro for the currently active Window Port whose function
    pointers have been loaded */
 #define WINDOWPORT(wn) \
-    (windowprocs.name && !strncmpi((wn), windowprocs.name, strlen((wn))))
+    (windowprocs.name && !strncmpi((#wn), windowprocs.name, strlen((#wn))))
 
 /* role selection by player_selection(); this ought to be in the core... */
 #define RS_NAME    0

diff --git a/src/bones.c b/src/bones.c
index 4c2f96e6aa9ba5a74149f52ae369c3b3cda3880a..39f3d24473b61e37b325dbaf869954001d495fb5 100644 (file)
--- a/src/bones.c
+++ b/src/bones.c
@@ -195,7 +195,7 @@ void
 sanitize_name(char *namebuf)
 {
     int c;
-    boolean strip_8th_bit = (WINDOWPORT("tty")
+    boolean strip_8th_bit = (WINDOWPORT(tty)
                              && !iflags.wc_eight_bit_input);
 
     /* it's tempting to skip this for single-user platforms, since

diff --git a/src/cmd.c b/src/cmd.c
index cb41bf676200a9a46d7f54ecb3eefbbaf2ad510d..3056d38309cbb86b0cee98d0165dfc5cb7709aae 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1532,7 +1532,7 @@ wiz_show_wmodes(void)
     int x, y;
     char row[COLNO + 1];
     struct rm *lev;
-    boolean istty = WINDOWPORT("tty");
+    boolean istty = WINDOWPORT(tty);
 
     win = create_nhwindow(NHW_TEXT);
     if (istty)

diff --git a/src/end.c b/src/end.c
index 124451d82119b37415168e0dd57d294ba13d5e1c..14322f931f420f5b64507ed99eed81f96e0e5ffc 100644 (file)
--- a/src/end.c
+++ b/src/end.c
@@ -110,7 +110,7 @@ panictrace_handler(int sig_unused UNUSED)
     int f2;
 
 #ifdef CURSES_GRAPHICS
-    if (iflags.window_inited && WINDOWPORT("curses")) {
+    if (iflags.window_inited && WINDOWPORT(curses)) {
         extern void curses_uncurse_terminal(void); /* wincurs.h */
 
         /* it is risky calling this during a program-terminating signal,

diff --git a/src/files.c b/src/files.c
index fba7166600e53dd9499d22071cef5b378c7c2784..e3dc1716df050250a980ee2f139b77e8e4ba3358 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1361,7 +1361,7 @@ docompress_file(const char *filename, boolean uncomp)
     int f;
     unsigned ln;
 #ifdef TTY_GRAPHICS
-    boolean istty = WINDOWPORT("tty");
+    boolean istty = WINDOWPORT(tty);
 #endif
 
 #ifdef COMPRESS_EXTENSION

diff --git a/src/invent.c b/src/invent.c
index 9db3c1d98f894e72f3a80478139c7e15ce3c5951..7ead2c4b7de04aa935d0d0c74aa3d0874437b246 100644 (file)
--- a/src/invent.c
+++ b/src/invent.c
@@ -2441,7 +2441,7 @@ update_inventory(void)
     save_suppress_price = iflags.suppress_price;
     iflags.suppress_price = 0;
 #if defined(TTY_PERM_INVENT) && defined(CORE_INVENT)
-    if (WINDOWPORT("tty"))
+    if (WINDOWPORT(tty))
         sync_perminvent();
     else
 #else
@@ -5407,7 +5407,7 @@ sync_perminvent(void)
          * FALSE without actually doing anything else.
          */
 #ifdef TTY_PERM_INVENT
-        if (WINDOWPORT("tty"))
+        if (WINDOWPORT(tty))
             perm_invent_toggled(TRUE); /* TRUE means negated */
 #endif
         (void) doredraw();
@@ -5443,7 +5443,7 @@ sync_perminvent(void)
      * [port]_update_inventory() mechanism.
      */
 
-    if (WINDOWPORT("tty") && iflags.perm_invent)
+    if (WINDOWPORT(tty) && iflags.perm_invent)
         wport_id = "tty perm_invent";
     else
         wport_id = "perm_invent";

diff --git a/src/options.c b/src/options.c
index 1015b0a75bfb6ce74a198a620c18525b434efa59..55a47a5b16cd70d829572f0590a6ee5cca260fa1 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -2063,7 +2063,7 @@ optfn_msg_window(int optidx, int req, boolean negated, char *opts, char *op)
         opts[0] = '\0';
 #if PREV_MSGS
         tmp = iflags.prevmsg_window;
-        if (WINDOWPORT("curses")) {
+        if (WINDOWPORT(curses)) {
             if (tmp == 's' || tmp == 'c')
                 tmp = iflags.prevmsg_window = 'r';
         }
@@ -2492,7 +2492,7 @@ optfn_petattr(int optidx, int req, boolean negated, char *opts, char *op)
             return optn_err;
 
 #ifdef CURSES_GRAPHICS
-        if (WINDOWPORT("curses")) {
+        if (WINDOWPORT(curses)) {
             char tmpbuf[QBUFSZ];
 
             Strcpy(opts, curses_fmt_attrs(tmpbuf));
@@ -4408,7 +4408,7 @@ optfn_boolean(int optidx, int req, boolean negated, char *opts, char *op)
                perm_invent_toggled() and routines it calls don't check
                iflags.perm_invent so it doesn't matter that 'SET IT HERE'
                hasn't been executed yet */
-            if (WINDOWPORT("tty") && !g.opt_initial && !negated) {
+            if (WINDOWPORT(tty) && !g.opt_initial && !negated) {
                 perm_invent_toggled(FALSE);
                 /* perm_invent_toggled()
                    -> sync_perminvent()
@@ -4498,7 +4498,7 @@ optfn_boolean(int optidx, int req, boolean negated, char *opts, char *op)
             break;
         case opt_hilite_pet:
 #ifdef CURSES_GRAPHICS
-            if (WINDOWPORT("curses")) {
+            if (WINDOWPORT(curses)) {
                 /* if we're enabling hilite_pet and petattr isn't set,
                    set it to Inverse; if we're disabling, leave petattr
                    alone so that re-enabling will get current value back
@@ -4515,7 +4515,7 @@ optfn_boolean(int optidx, int req, boolean negated, char *opts, char *op)
                 status_initialize(REASSESS_ONLY);
                 g.opt_need_redraw = TRUE;
 #ifdef QT_GRAPHICS
-            } else if (WINDOWPORT("Qt")) {
+            } else if (WINDOWPORT(Qt)) {
                 /* Qt doesn't support HILITE_STATUS or FLUSH_STATUS so fails
                    VIA_WINDOWPORT(), but it does support WC2_HITPOINTBAR */
                 g.context.botlx = TRUE;
@@ -4877,7 +4877,7 @@ handler_msg_window(void)
 #if PREV_MSGS /* tty or curses */
     winid tmpwin;
     anything any;
-    boolean is_tty = WINDOWPORT("tty"), is_curses = WINDOWPORT("curses");
+    boolean is_tty = WINDOWPORT(tty), is_curses = WINDOWPORT(curses);
     int clr = 0;
 
     if (is_tty || is_curses) {
@@ -6304,7 +6304,7 @@ initoptions_finish(void)
      * Option processing can take place before a user-decided WindowPort
      * is even initialized, so check for that too.
      */
-    if (!WINDOWPORT("safe-startup")) {
+    if (!WINDOWPORT(safe-startup)) {
         if (iflags.hilite_delta && !wc2_supported("statushilites")) {
             raw_printf("Status highlighting not supported for %s interface.",
                        windowprocs.name);
@@ -8956,7 +8956,7 @@ enhance_menu_text(
     availsz = sz - nowsz;
 
 #ifdef TTY_PERM_INVENT
-    if (bool_p == &iflags.perm_invent && WINDOWPORT("tty")) {
+    if (bool_p == &iflags.perm_invent && WINDOWPORT(tty)) {
         if (thisopt->setwhere == set_gameview)
             Snprintf(eos(buf), availsz, " *terminal size is too small");
     }

diff --git a/src/restore.c b/src/restore.c
index cb4ec066fc09eaa6529f05bb60f09320197846e1..2a89b8ca143faafb944b9a67962cd1fc3c6e228f 100644 (file)
--- a/src/restore.c
+++ b/src/restore.c
@@ -788,7 +788,7 @@ dorecover(NHFILE* nhfp)
 #ifdef AMII_GRAPHICS
     {
         extern struct window_procs amii_procs;
-        if (WINDOWPORT("amii")) {
+        if (WINDOWPORT(amii)) {
             extern winid WIN_BASE;
             clear_nhwindow(WIN_BASE); /* hack until there's a hook for this */
         }
@@ -804,7 +804,7 @@ dorecover(NHFILE* nhfp)
     curs(WIN_MAP, 1, 1);
     dotcnt = 0;
     dotrow = 2;
-    if (!WINDOWPORT("X11"))
+    if (!WINDOWPORT(X11))
         putstr(WIN_MAP, 0, "Restoring:");
 #endif
     restoreinfo.mread_flags = 1; /* return despite error */
@@ -821,7 +821,7 @@ dorecover(NHFILE* nhfp)
             dotrow++;
             dotcnt = 0;
         }
-        if (!WINDOWPORT("X11")) {
+        if (!WINDOWPORT(X11)) {
             putstr(WIN_MAP, 0, ".");
         }
         mark_synch();

diff --git a/src/save.c b/src/save.c
index 758942fd57eb0083ca92048a19ad1bf7243983c1..690c5f2f394713110eeb883077d93f3b7529d6a8 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -149,7 +149,7 @@ dosave0(void)
     dotcnt = 0;
     dotrow = 2;
     curs(WIN_MAP, 1, 1);
-    if (!WINDOWPORT("X11"))
+    if (!WINDOWPORT(X11))
         putstr(WIN_MAP, 0, "Saving:");
 #endif
     nhfp->mode = WRITING | FREEING;
@@ -197,7 +197,7 @@ dosave0(void)
             dotrow++;
             dotcnt = 0;
         }
-        if (!WINDOWPORT("X11")) {
+        if (!WINDOWPORT(X11)) {
             putstr(WIN_MAP, 0, ".");
         }
         mark_synch();

diff --git a/src/sounds.c b/src/sounds.c
index 777090fe3f6fefe1b00e663b9a4e807ad94578f9..9df6ad57291e28e97712389077e0966df21780a3 100644 (file)
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -1516,16 +1516,16 @@ maybe_play_sound(const char* msg)
         && !iflags.vt_sounddata
 #endif
 #if defined(QT_GRAPHICS)
-        && WINDOWPORT("Qt")
+        && WINDOWPORT(Qt)
 #endif
 #if defined(WIN32)
-        && (WINDOWPORT("tty") || WINDOWPORT("mswin") || WINDOWPORT("curses"))
+        && (WINDOWPORT(tty) || WINDOWPORT(mswin) || WINDOWPORT(curses))
 #endif
 #endif /* WIN32 || QT_GRAPHICS */
         )
         play_usersound(snd->filename, snd->volume);
 #if defined(TTY_GRAPHICS) && defined(TTY_SOUND_ESCCODES)
-    else if (snd && iflags.vt_sounddata && snd->idx >= 0 && WINDOWPORT("tty"))
+    else if (snd && iflags.vt_sounddata && snd->idx >= 0 && WINDOWPORT(tty))
         play_usersound_via_idx(snd->idx, snd->volume);
 #endif  /* TTY_GRAPHICS && TTY_SOUND_ESCCODES */
 #endif  /* WIN32 || QT_GRAPHICS || TTY_SOUND_ESCCODES */

diff --git a/src/windows.c b/src/windows.c
index 06a02b414d5161053b7c95bb35d59198fce0b1e5..17762eaa9b48c709fa5aa4b4d9444179fe0f1b17 100644 (file)
--- a/src/windows.c
+++ b/src/windows.c
@@ -312,7 +312,7 @@ choose_windows(const char *s)
         free((genericptr_t) tmps) /*, tmps = 0*/ ;
 
     if (windowprocs.win_raw_print == def_raw_print
-            || WINDOWPORT("safe-startup"))
+            || WINDOWPORT(safe-startup))
         nh_terminate(EXIT_SUCCESS);
 }
 

diff --git a/sys/share/pcunix.c b/sys/share/pcunix.c
index 4a96483935df161ba42e6db5dc0dfd757377376d..29499bc9040caaf1f57b500e7145a1192e33c9f2 100644 (file)
--- a/sys/share/pcunix.c
+++ b/sys/share/pcunix.c
@@ -188,7 +188,7 @@ getlock(void)
 #else /*SELF_RECOVER*/
         if (recover_savefile()) {
 #if defined(TTY_GRAPHICS)
-            if (WINDOWPORT("tty"))
+            if (WINDOWPORT(tty))
                 clear_screen(); /* display gets fouled up otherwise */
 #endif
             goto gotlock;

diff --git a/sys/share/unixtty.c b/sys/share/unixtty.c
index 5d353928d998be6a97cee63ce62fc61fd58dc054..4e932b748e8f29f5dcec450d89b4e180193ac37b 100644 (file)
--- a/sys/share/unixtty.c
+++ b/sys/share/unixtty.c
@@ -316,7 +316,7 @@ void intron(void) /* enable kbd interupts if enabled when game started */
 {
 #ifdef TTY_GRAPHICS
     /* Ugly hack to keep from changing tty modes for non-tty games -dlc */
-    if (WINDOWPORT("tty") && intr_char != nonesuch
+    if (WINDOWPORT(tty) && intr_char != nonesuch
         && curttyb2.intr_sym != '\003') {
         curttyb2.intr_sym = '\003';
         setctty();
@@ -328,7 +328,7 @@ void introff(void) /* disable kbd interrupts if required*/
 {
 #ifdef TTY_GRAPHICS
     /* Ugly hack to keep from changing tty modes for non-tty games -dlc */
-    if (WINDOWPORT("tty") && curttyb2.intr_sym != nonesuch) {
+    if (WINDOWPORT(tty) && curttyb2.intr_sym != nonesuch) {
         curttyb2.intr_sym = nonesuch;
         setctty();
     }
@@ -356,7 +356,7 @@ void
 sco_mapon(void)
 {
 #ifdef TTY_GRAPHICS
-    if (WINDOWPORT("tty") && sco_flag_console) {
+    if (WINDOWPORT(tty) && sco_flag_console) {
         if (sco_map_valid != -1) {
             ioctl(0, LDSMAP, sco_chanmap_buf);
         }
@@ -369,7 +369,7 @@ void
 sco_mapoff(void)
 {
 #ifdef TTY_GRAPHICS
-    if (WINDOWPORT("tty") && sco_flag_console) {
+    if (WINDOWPORT(tty) && sco_flag_console) {
         sco_map_valid = ioctl(0, LDGMAP, sco_chanmap_buf);
         if (sco_map_valid != -1) {
             ioctl(0, LDNMAP, (char *) 0);
@@ -390,7 +390,7 @@ void
 init_sco_cons(void)
 {
 #ifdef TTY_GRAPHICS
-    if (WINDOWPORT("tty") && sco_flag_console) {
+    if (WINDOWPORT(tty) && sco_flag_console) {
         atexit(sco_mapon);
         sco_mapoff();
         load_symset("IBMGraphics", PRIMARYSET);
@@ -420,7 +420,7 @@ void
 linux_mapon(void)
 {
 #ifdef TTY_GRAPHICS
-    if (WINDOWPORT("tty") && linux_flag_console) {
+    if (WINDOWPORT(tty) && linux_flag_console) {
         write(1, "\033(B", 3);
     }
 #endif
@@ -430,7 +430,7 @@ void
 linux_mapoff(void)
 {
 #ifdef TTY_GRAPHICS
-    if (WINDOWPORT("tty") && linux_flag_console) {
+    if (WINDOWPORT(tty) && linux_flag_console) {
         write(1, "\033(U", 3);
     }
 #endif
@@ -450,7 +450,7 @@ void
 init_linux_cons(void)
 {
 #ifdef TTY_GRAPHICS
-    if (WINDOWPORT("tty") && linux_flag_console) {
+    if (WINDOWPORT(tty) && linux_flag_console) {
         atexit(linux_mapon);
         linux_mapoff();
 #ifdef TEXTCOLOR

diff --git a/sys/windows/consoletty.c b/sys/windows/consoletty.c
index 7dbcfe03201f10f97a9bf4535373b09cf1a0c3cc..e96708416d7eef3e225890208537cf57ab2ed1f9 100644 (file)
--- a/sys/windows/consoletty.c
+++ b/sys/windows/consoletty.c
@@ -1441,7 +1441,7 @@ cl_end(void)
 void
 raw_clear_screen(void)
 {
-    if (WINDOWPORT("tty")) {
+    if (WINDOWPORT(tty)) {
         cell_t * back = console.back_buffer;
         cell_t * front = console.front_buffer;
         COORD pos;

diff --git a/sys/windows/windmain.c b/sys/windows/windmain.c
index f67826287b086a66ce36b924d173f4fac7e00fba..537cff883b33c839daaff608a65f6c374d9277ff 100644 (file)
--- a/sys/windows/windmain.c
+++ b/sys/windows/windmain.c
@@ -541,14 +541,14 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
 
     nethack_enter(argc, argv);
     iflags.use_background_glyph = FALSE;
-    if (WINDOWPORT("mswin"))
+    if (WINDOWPORT(mswin))
         iflags.use_background_glyph = TRUE;
-    if (WINDOWPORT("tty"))
+    if (WINDOWPORT(tty))
         consoletty_open(1);
 
     init_nhwindows(&argc, argv);
 
-    if (WINDOWPORT("tty"))
+    if (WINDOWPORT(tty))
         toggle_mouse_support();
 
     if (g.symset[PRIMARYSET].handling
@@ -569,7 +569,7 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
 #endif     /* TERMLIB || CURSES */
 #if 0
 #ifdef CURSES_GRAPHICS
-    if (WINDOWPORT("curses"))
+    if (WINDOWPORT(curses))
         (*cursesgraphics_mode_callback)();
 #endif
 #endif
@@ -893,7 +893,7 @@ safe_routines(void)
      * Get a set of valid safe windowport function
      * pointers during early startup initialization.
      */
-    if (!WINDOWPORT("safe-startup"))
+    if (!WINDOWPORT(safe-startup))
         windowprocs = *get_safe_procs(1);
     if (!GUILaunched)
         windowprocs.win_nhgetch = windows_console_custom_nhgetch;
@@ -1148,7 +1148,7 @@ getlock(void)
     const char *fq_lock;
 #define OOPS_BUFSZ 512
     char oops[OOPS_BUFSZ];
-    boolean istty = WINDOWPORT("tty");
+    boolean istty = WINDOWPORT(tty);
 
     /* we ignore QUIT and INT at this point */
     if (!lock_file(HLOCK, LOCKPREFIX, 10)) {
@@ -1179,7 +1179,7 @@ getlock(void)
 
     (void) nhclose(fd);
 
-    if (WINDOWPORT("tty"))
+    if (WINDOWPORT(tty))
         prompt_result = tty_self_recover_prompt();
     else
         prompt_result = other_self_recover_prompt();
@@ -1316,7 +1316,7 @@ tty_self_recover_prompt(void)
     c = 'n';
     ct = 0;
     saved_procs = windowprocs;
-    if (!WINDOWPORT("safe-startup"))
+    if (!WINDOWPORT(safe-startup))
         windowprocs = *get_safe_procs(2); /* arg 2 uses no-newline variant */
     windowprocs.win_nhgetch = windows_console_custom_nhgetch;
     raw_print("\n");
@@ -1376,13 +1376,13 @@ int
 other_self_recover_prompt(void)
 {
     register int c, ci, ct, pl, retval = 0;
-    boolean ismswin = WINDOWPORT("mswin"),
-            iscurses = WINDOWPORT("curses");
+    boolean ismswin = WINDOWPORT(mswin),
+            iscurses = WINDOWPORT(curses);
 
     pl = 1;
     c = 'n';
     ct = 0;
-    if (iflags.window_inited || WINDOWPORT("curses")) {
+    if (iflags.window_inited || WINDOWPORT(curses)) {
         c = yn("There are files from a game in progress under your name. "
                "Recover?");
     } else {

diff --git a/sys/windows/windsys.c b/sys/windows/windsys.c
index 78125da756eb20d2d492397952baa8b62435b1d4..33aae1128c00028df31e1e87d2df0491170bc12d 100644 (file)
--- a/sys/windows/windsys.c
+++ b/sys/windows/windsys.c
@@ -201,7 +201,7 @@ VA_DECL(const char *, s)
     /* error() may get called before tty is initialized */
     if (iflags.window_inited)
         end_screen();
-    if (WINDOWPORT("tty")) {
+    if (WINDOWPORT(tty)) {
         buf[0] = '\n';
         (void) vsnprintf(&buf[1], sizeof buf - (1 + sizeof "\n"), s, VA_ARGS);
         Strcat(buf, "\n");
@@ -228,12 +228,12 @@ win32_abort(void)
 {
     int c;
 
-    if (WINDOWPORT("mswin") || WINDOWPORT("tty")) {
+    if (WINDOWPORT(mswin) || WINDOWPORT(tty)) {
         if (iflags.window_inited)
             exit_nhwindows((char *) 0);
         iflags.window_inited = FALSE;
     }
-    if (!WINDOWPORT("mswin") && !WINDOWPORT("safe-startup"))
+    if (!WINDOWPORT(mswin) && !WINDOWPORT(safe-startup))
         safe_routines();
     if (wizard) {
         raw_print("Execute debug breakpoint wizard?");
@@ -482,7 +482,7 @@ getreturn(const char *str)
     in_getreturn = TRUE;
     Sprintf(buf,"Hit <Enter> %s.", str);
     raw_print(buf);
-    if (WINDOWPORT("tty"))
+    if (WINDOWPORT(tty))
         windows_console_custom_nhgetch();
     wait_synch();
     in_getreturn = FALSE;
@@ -493,7 +493,7 @@ getreturn(const char *str)
    initializing the window port */
 void nethack_enter_windows(void)
 {
-    if (WINDOWPORT("tty"))
+    if (WINDOWPORT(tty))
         nethack_enter_consoletty();
 }