From: PatR <rankin@nethack.org>
Date: Wed, 10 Mar 2021 21:50:44 +0000 (-0800)
Subject: remove several obsolete C() and M() macros
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=015380fecf7b84e4a86282adc896ac225ca032a5;p=nethack

remove several obsolete C() and M() macros

The ones moved from cmd.c to global.h suffice.
---

diff --git a/win/Qt/qt_main.cpp b/win/Qt/qt_main.cpp
index a0aa18552..69126e36e 100644
--- a/win/Qt/qt_main.cpp
+++ b/win/Qt/qt_main.cpp
@@ -899,10 +899,6 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
 }
 
 #ifdef CTRL_V_HACK
-#ifndef C
-#define C(c) (0x1f & (c))
-#endif
-
 // called when ^V is typed while the main window has keyboard focus;
 // all other control characters go through NetHackQtBind::notify()
 void NetHackQtMainWindow::CtrlV()
diff --git a/win/curses/cursmisc.c b/win/curses/cursmisc.c
index e1b4f63e2..50703c0b9 100644
--- a/win/curses/cursmisc.c
+++ b/win/curses/cursmisc.c
@@ -21,19 +21,6 @@ static int curs_y = -1;
 
 static int parse_escape_sequence(void);
 
-/* Macros for Control and Alt keys */
-
-#ifndef M
-# ifndef NHSTDC
-#  define M(c)          (0x80 | (c))
-# else
-#  define M(c)          ((c) - 128)
-# endif/* NHSTDC */
-#endif
-#ifndef C
-# define C(c)           (0x1f & (c))
-#endif
-
 
 /* Read a character of input from the user */
 
diff --git a/win/tty/topl.c b/win/tty/topl.c
index 46a1f482f..809937664 100644
--- a/win/tty/topl.c
+++ b/win/tty/topl.c
@@ -10,10 +10,6 @@
 #include "tcap.h"
 #include "wintty.h"
 
-#ifndef C /* this matches src/cmd.c */
-#define C(c) (0x1f & (c))
-#endif
-
 static void redotoplin(const char *);
 static void topl_putsym(char);
 static void removetopl(int);