--- mstools/mfc/include/afx.h	2018/08/09 18:22:44	1.1.1.2
+++ mstools/mfc/include/afx.h	2018/08/09 18:25:02	1.1.1.3
@@ -52,10 +52,6 @@ class CDumpContext;                   //
 
 #include <string.h>
 #include <stdio.h>
-#ifdef _NTWIN
-//REVIEW_NT: bogus code in stdlib.h causes this warning.
-#pragma warning(disable: 4069)
-#endif
 #include <stdlib.h>
 #ifdef _NTWIN
 #pragma warning(default: 4069)
@@ -123,11 +119,9 @@ class CDumpContext;                   //
 
 #else
 
-extern "C" {
 #include <excpt.h>
 #include <windef.h>
 #include <winbase.h>
-}
 
 #define BASED_CODE
 #undef _NEARDATA
@@ -164,6 +158,11 @@ extern "C" {
 #define _frealloc realloc
 #define _ffree free
 
+// _export is not accepted by the NT compiler
+#define __export
+#define _export
+#define export
+
 #undef GetCurrentTime
 inline unsigned long GetCurrentTime(void)
 	{ return ::GetTickCount(); }
@@ -379,14 +378,16 @@ struct NEAR CClassInit
 /////////////////////////////////////////////////////////////////////////////
 // setjmp for Windows and C++
 
+
 #ifdef _NTWIN
-typedef  int  jmp_buf[8];
+#ifdef _M_MRX000
+typedef  double  jmp_buf[16];
 #else
-typedef  int  jmp_buf[9];
+typedef  int     jmp_buf[8];
+#define  setjmp  _setjmp
 #endif
-
-#ifdef _NTWIN
-#define setjmp _setjmp
+#else
+typedef  int  jmp_buf[9];
 #endif
 
 #if defined(_WINDOWS) && defined(_DOSWIN)