--- mstools/h/excpt.h	2018/08/09 18:21:10	1.1.1.3
+++ mstools/h/excpt.h	2018/08/09 18:23:06	1.1.1.4
@@ -1,7 +1,7 @@
 /***
 *excpt.h - defines exception values, types and routines
 *
-*	Copyright (c) 1990-1992, Microsoft Corporation. All rights reserved.
+*	Copyright (c) 1990-1993, Microsoft Corporation. All rights reserved.
 *
 *Purpose:
 *	This file contains the definitions and prototypes for the compiler-
@@ -29,15 +29,6 @@ extern "C" {
 #define _CRTAPI1 __cdecl
 #define _CRTAPI2 __cdecl
 
-#elif ( _MSC_VER == 600 )
-
-/*
- * Definitions for old MS C6-386 compiler
- */
-#define _CRTAPI1 _cdecl
-#define _CRTAPI2 _cdecl
-#define _M_IX86  300
-
 #else
 
 /*
@@ -66,6 +57,12 @@ typedef enum _EXCEPTION_DISPOSITION {
 
 #ifdef	_M_IX86
 
+/*
+ * Declarations to keep MS C 8 (386/486) compiler happy
+ */
+struct _EXCEPTION_RECORD;
+struct _CONTEXT;
+
 EXCEPTION_DISPOSITION _CRTAPI2 _except_handler (
 	struct _EXCEPTION_RECORD *ExceptionRecord,
 	void * EstablisherFrame,
@@ -73,10 +70,10 @@ EXCEPTION_DISPOSITION _CRTAPI2 _except_h
 	void * DispatcherContext
 	);
 
-#elif	( defined(_M_RX000) || defined(M_MRX000) || defined(MIPS) || defined(MIPS) )
+#elif defined(_M_MRX000) || defined(_MIPS_) || defined(_ALPHA_)
 
 /*
- * Declarations to keep MIPS compiler happy
+ * Declarations to keep MIPS and ALPHA compiler happy
  */
 typedef struct _EXCEPTION_POINTERS *Exception_info_ptr;
 struct _EXCEPTION_RECORD;
@@ -102,31 +99,14 @@ EXCEPTION_DISPOSITION __C_specific_handl
 /*
  * MS C8-32 (386/486)
  */
-#define try				_try
-#define except				_except
-#define finally 			_finally
-#define GetExceptionCode		_exception_code
-#define exception_code			_exception_code
-#define GetExceptionInformation 	(struct _EXCEPTION_POINTERS *)_exception_info
-#define exception_info			(struct _EXCEPTION_POINTERS *)_exception_info
-#define AbnormalTermination		_abnormal_termination
-#define abnormal_termination		_abnormal_termination
-
-unsigned long _CRTAPI1 _exception_code(void);
-void *	      _CRTAPI1 _exception_info(void);
-int	      _CRTAPI1 _abnormal_termination(void);
-
-#elif	( (_MSC_VER == 600) || defined(M_MRX000) )
-/*
- * Old MS C 6-386 or MS MIPS compiler
- */
-#define try				_try
-#define except				_except
-#define finally 			_finally
+#define try				__try
+#define except				__except
+#define finally 			__finally
+#define leave				__leave
 #define GetExceptionCode		_exception_code
 #define exception_code			_exception_code
-#define GetExceptionInformation 	(struct _EXCEPTION_POINTERS *)_exception_info
-#define exception_info			(struct _EXCEPTION_POINTERS *)_exception_info
+#define GetExceptionInformation         (struct _EXCEPTION_POINTERS *)_exception_info
+#define exception_info                  (struct _EXCEPTION_POINTERS *)_exception_info
 #define AbnormalTermination		_abnormal_termination
 #define abnormal_termination		_abnormal_termination
 
@@ -134,9 +114,9 @@ unsigned long _CRTAPI1 _exception_code(v
 void *	      _CRTAPI1 _exception_info(void);
 int	      _CRTAPI1 _abnormal_termination(void);
 
-#elif	( defined(_M_RX000) || defined(MIPS) || defined(MIPS) )
+#elif defined(_M_MRX000) || defined(_MIPS_) || defined(_ALPHA_)
 /*
- * MIPS compiler
+ * MIPS or ALPHA compiler
  */
 #define try				__builtin_try
 #define except				__builtin_except
@@ -144,8 +124,8 @@ int	      _CRTAPI1 _abnormal_termination
 #define leave				__builtin_leave
 #define GetExceptionCode()		__exception_code
 #define exception_code()		__exception_code
-#define GetExceptionInformation()	(struct _EXCEPTION_POINTERS *)__exception_info
-#define exception_info()		(struct _EXCEPTION_POINTERS *)__exception_info
+#define GetExceptionInformation()       (struct _EXCEPTION_POINTERS *)__exception_info
+#define exception_info()                (struct _EXCEPTION_POINTERS *)__exception_info
 #define AbnormalTermination()		__abnormal_termination
 #define abnormal_termination()		__abnormal_termination