--- mstools/h/varargs.h	2018/08/09 18:20:33	1.1.1.2
+++ mstools/h/varargs.h	2018/08/09 18:23:08	1.1.1.3
@@ -27,7 +27,7 @@ typedef char *va_list;
 
 
 
-#ifdef i386
+#ifdef _X86_
 /*
  * define a macro to compute the size of a type, variable or expression,
  * rounded up to the nearest multiple of sizeof(int). This number is its
@@ -43,15 +43,8 @@ typedef char *va_list;
 #define va_end(ap) ap = (va_list)0
 #endif
 
-#ifdef M_MRX000
 
-#define va_dcl int va_alist;
-#define va_start(ap) ap = (va_list)&va_alist
-#define va_arg(ap,t) *((t*)(_va_arg(&(ap),sizeof(t),(t*)0,(t*)0)))
-#define va_end(ap)
-
-#else
-#ifdef MIPS
+#if defined(_M_MRX000)
 #define va_dcl int va_alist;
 #define va_start(list) list = (char *) &va_alist
 #define va_end(list)
@@ -65,7 +58,6 @@ typedef char *va_list;
     use a pointer for array types
     +++++++++++++++++++++++++++++++++++++++++++ */
 #endif
-#endif
 
 
 #ifdef __cplusplus