more win32 de-MICRO

include/ntconf.h

@@ -111,12 +111,6 @@
 #endif
 
 #if 0
-#ifndef C
-#define C(c)	(0x1f & (c))
-#endif
-#ifndef M
-#define M(c)	(0x80 | (c))
-#endif
 extern char levels[], bones[], permbones[],
 #endif /* 0 */
 
@@ -126,6 +120,7 @@ extern char hackdir[];
 #define ABORT C('a')
 #define getuid() 1
 #define getlogin() ((char *)0)
+extern void NDECL(win32_abort);
 
 #include <fcntl.h>
 #ifndef __BORLANDC__

sys/winnt/winnt.c

@@ -38,7 +38,6 @@
 HANDLE ffhandle = (HANDLE)0;
 WIN32_FIND_DATA ffd;
 
-
 /* The function pointer nt_kbhit contains a kbhit() equivalent
  * which varies depending on which window port is active.
  * For the tty port it is tty_kbhit() [from nttty.c]
@@ -224,6 +223,17 @@ void Delay(int ms)
 {
 	(void)Sleep(ms);
 }
+
+void win32_abort()
+{
+
+#ifdef WIZARD
+   	if (wizard)
+		DebugBreak();
+#endif
+	abort();
+}
+
 #endif /* WIN32 */
 
 /*winnt.c*/