--- mstools/h/stddef.h 2018/08/09 18:20:32 1.1.1.2 +++ mstools/h/stddef.h 2018/08/09 18:21:11 1.1.1.3 @@ -17,12 +17,38 @@ extern "C" { #endif -#ifndef MIPS -#if (_MSC_VER <= 600) -#define __cdecl _cdecl -#endif +/* + * Conditional macro definition for function calling type and variable type + * qualifiers. + */ +#if ( (_MSC_VER >= 800) && (_M_IX86 >= 300) ) + +/* + * Definitions for MS C8-32 (386/486) compiler + */ +#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 + +/* + * Other compilers (e.g., MIPS) + */ +#define _CRTAPI1 +#define _CRTAPI2 + #endif + /* define NULL pointer value and the offset() macro */ #ifndef NULL @@ -40,7 +66,7 @@ extern "C" { /* declare reference to errno */ #ifdef _MT -extern int * _errno(void); +extern int * _CRTAPI1 _errno(void); #define errno (*_errno()) #else extern int errno; @@ -69,9 +95,9 @@ typedef unsigned short wchar_t; -extern unsigned long __threadid(void); +extern unsigned long _CRTAPI1 __threadid(void); #define _threadid (__threadid()) -extern unsigned long __threadhandle(void); +extern unsigned long _CRTAPI1 __threadhandle(void);