--- mstools/h/stdlib.h	2018/08/09 18:21:02	1.1.1.3
+++ mstools/h/stdlib.h	2018/08/09 18:22:55	1.1.1.4
@@ -1,7 +1,7 @@
 /***
 *stdlib.h - declarations/definitions for commonly used library functions
 *
-*	Copyright (c) 1985-1992, Microsoft Corporation. All rights reserved.
+*	Copyright (c) 1985-1993, Microsoft Corporation. All rights reserved.
 *
 *Purpose:
 *	This include file contains the function declarations for
@@ -31,15 +31,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
 
 /*
@@ -111,7 +102,9 @@ typedef struct _ldiv_t {
 
 #define RAND_MAX 0x7fff
 
+#ifndef _MB_CUR_MAX_DEFINED
 /* max mb-len for current locale */
+/* also defined in ctype.h */
 #ifdef	_DLL
 #define __mb_cur_max	(*__mb_cur_max_dll)
 #define MB_CUR_MAX	(*__mb_cur_max_dll)
@@ -120,6 +113,8 @@ extern	unsigned short *__mb_cur_max_dll;
 #define MB_CUR_MAX __mb_cur_max
 extern	unsigned short __mb_cur_max;
 #endif
+#define _MB_CUR_MAX_DEFINED
+#endif /* _MB_CUR_MAX_DEFINED */
 
 /* min and max macros */
 
@@ -162,11 +157,15 @@ extern unsigned long _doserrno;	/* OS sy
 extern char ** _sys_errlist;	/* perror error message table */
 
 #define _sys_nerr   (*_sys_nerr_dll)
+#define __argc      (*__argc_dll)
+#define __argv      (*__argv_dll)
 #define _environ    (*_environ_dll)
 #define _fmode	    (*_fmode_dll)
 #define _fileinfo   (*_fileinfo_dll)
 
 extern int * _sys_nerr_dll;	/* # of entries in sys_errlist table */
+extern int * __argc_dll;	/* count of cmd line args */
+extern char *** __argv_dll;	/* pointer to table of cmd line args */
 extern char *** _environ_dll;	/* pointer to environment table */
 extern int * _fmode_dll;	/* default file translation mode */
 extern int * _fileinfo_dll;	/* open file info mode (for spawn) */
@@ -203,6 +202,9 @@ extern unsigned int * _osminor_dll;
 extern char * _sys_errlist[];	/* perror error message table */
 extern int _sys_nerr;		/* # of entries in sys_errlist table */
 
+extern int __argc;		/* count of cmd line args */
+extern char ** __argv; 	/* pointer to table of cmd line args */
+
 #ifdef _POSIX_
 extern char ** environ;	/* pointer to environment table */
 #else
@@ -286,6 +288,7 @@ ldiv_t _CRTAPI1 ldiv(long, long);
 char * _CRTAPI1 _ltoa(long, char *, int);
 void * _CRTAPI1 malloc(size_t);
 int    _CRTAPI1 mblen(const char *, size_t);
+size_t _CRTAPI1 _mbstrlen(const char *s);
 int    _CRTAPI1 mbtowc(wchar_t *, const char *, size_t);
 size_t _CRTAPI1 mbstowcs(wchar_t *, const char *, size_t);
 void   _CRTAPI1 qsort(void *, size_t, size_t, int (_CRTAPI1 *)