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 a0aa18552b6913bfe65a757160d271e9d0946c88..69126e36e6764c5eae59db496baa54729b494975 100644 (file)
--- 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 e1b4f63e2c6bccef89d55c6dd622a19ccc784f59..50703c0b9537181639444aa963ca533f32231dfa 100644 (file)
--- 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 46a1f482fd82d4b714ef315879ff8a12a983922a..809937664d398e060d9e5dcdcae30038cede418b 100644 (file)
--- 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);