From 491cb52dcc5da4da85507bb9773d62752ae95480 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Fri, 11 Aug 2006 22:19:45 +0000
Subject: [PATCH] Dropped support for Microway NDP, a long-dead compiler that
 was reputedly never very good anyway.

---
 curses.h      | 17 +----------------
 dos/pdcdos.h  | 12 +++---------
 dos/pdckbd.c  | 13 +++----------
 dos/pdcscrn.c |  4 ++--
 dos/pdcutil.c |  4 ++--
 5 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/curses.h b/curses.h
index cdbcb538..0f2e4841 100644
--- a/curses.h
+++ b/curses.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curses.h,v 1.212 2006/08/11 22:10:36 wmcbrine Exp $ */
+/* $Id: curses.h,v 1.213 2006/08/11 22:19:45 wmcbrine Exp $ */
 
 /*----------------------------------------------------------------------*
  *				PDCurses				*
@@ -294,21 +294,6 @@ PDCurses portable platform definitions list:
 #  endif
 #endif
 
-/*----------------------------------------
- *	MicroWay NDP C/C++ 386 4.2.0 compiler
- */
-
-#ifdef MX386
-#  include <bios.h>
-#  ifdef DOS
-#    ifdef __i860
-typedef void _int;
-#    else
-typedef int  _int;
-#    endif
-#  endif
-#endif
-
 /*----------------------------------------
  *	HI-TECH COMPILERS Pacific C
  *
diff --git a/dos/pdcdos.h b/dos/pdcdos.h
index 41a01b73..3b8faf81 100644
--- a/dos/pdcdos.h
+++ b/dos/pdcdos.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: pdcdos.h,v 1.8 2006/08/11 22:10:36 wmcbrine Exp $ */
+/* $Id: pdcdos.h,v 1.9 2006/08/11 22:19:45 wmcbrine Exp $ */
 
 #define CURSES_LIBRARY 1
 #include <curses.h>
@@ -53,13 +53,7 @@
 
 #include <dos.h>
 
-#ifdef MX386
-typedef union REGS16 Regs;
-#else
-typedef union REGS Regs;
-#endif
-
-extern Regs regs;
+extern union REGS regs;
 
 #ifdef __DJGPP__		/* Note: works only in plain DOS... */
 # if DJGPP == 2
@@ -72,7 +66,7 @@ extern Regs regs;
 # ifdef __TURBOC__
 #  define _FAR_POINTER(s,o)	MK_FP(s,o)
 # else
-#  if (defined(__WATCOMC__) && defined(__FLAT__)) || defined(MX386)
+#  if defined(__WATCOMC__) && defined(__FLAT__)
 #   define _FAR_POINTER(s,o)	((((int)(s)) << 4) + ((int)(o)))
 #  else
 #   define _FAR_POINTER(s,o)	(((long)s << 16) | (long)o)
diff --git a/dos/pdckbd.c b/dos/pdckbd.c
index 4b5751ee..3b85e100 100644
--- a/dos/pdckbd.c
+++ b/dos/pdckbd.c
@@ -23,7 +23,7 @@
 
 #include "pdcdos.h"
 
-RCSID("$Id: pdckbd.c,v 1.32 2006/08/11 05:43:37 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.33 2006/08/11 22:19:45 wmcbrine Exp $");
 
 /************************************************************************
  *    Table for key code translation of function keys in keypad mode	*
@@ -349,22 +349,15 @@ int PDC_set_ctrl_break(bool setting)
 {
 	PDC_LOG(("PDC_set_ctrl_break() - called\n"));
 
-#ifdef MX386
-	if (setting)
-		_ignore_breaks();
-	else
-		_watch_breaks();
-#else
-# ifdef __DJGPP__
+#ifdef __DJGPP__
 	signal(SIGINT, setting ? SIG_DFL : SIG_IGN);
 /*	__djgpp_set_ctrl_c(setting);*/
 	setcbrk(setting);
-# else
+#else
 	regs.h.ah = 0x33;
 	regs.h.al = 0x00;
 	regs.h.dl = (unsigned char) (setting ? 1 : 0);
 	int86(0x21, &regs, &regs);
-# endif
 #endif
 	return OK;
 }
diff --git a/dos/pdcscrn.c b/dos/pdcscrn.c
index 4ca1554c..2e4dbaa8 100644
--- a/dos/pdcscrn.c
+++ b/dos/pdcscrn.c
@@ -24,9 +24,9 @@
 # include <sys/movedata.h>
 #endif
 
-RCSID("$Id: pdcscrn.c,v 1.43 2006/08/11 22:10:36 wmcbrine Exp $");
+RCSID("$Id: pdcscrn.c,v 1.44 2006/08/11 22:19:45 wmcbrine Exp $");
 
-Regs regs;	/* used in various other modules */
+union REGS regs;	/* used in various other modules */
 
 static unsigned short *saved_screen = NULL;
 static int saved_lines = 0;
diff --git a/dos/pdcutil.c b/dos/pdcutil.c
index ef0628ea..2b48391e 100644
--- a/dos/pdcutil.c
+++ b/dos/pdcutil.c
@@ -36,7 +36,7 @@
 # endif
 #endif
 
-RCSID("$Id: pdcutil.c,v 1.7 2006/07/29 06:00:54 wmcbrine Exp $");
+RCSID("$Id: pdcutil.c,v 1.8 2006/08/11 22:19:45 wmcbrine Exp $");
 
 void PDC_beep(void)
 {
@@ -59,7 +59,7 @@ void PDC_napms(int ms)
 
 	delay(ms);
 
-# elif defined(MSC) || defined(MX386)
+# elif defined(MSC)
 	{
 		clock_t goal = (ms / 50) + clock();
 		while (goal > clock())