--- mstools/h/locale.h 2018/08/09 18:20:01 1.1 +++ mstools/h/locale.h 2018/08/09 18:23:09 1.1.1.4 @@ -1,7 +1,7 @@ /*** *locale.h - definitions/declarations for localization routines * -* Copyright (c) 1988-1991, Microsoft Corporation. All rights reserved. +* Copyright (c) 1988-1993, Microsoft Corporation. All rights reserved. * *Purpose: * This file defines the structures, values, macros, and functions @@ -16,10 +16,29 @@ extern "C" { #endif -#if (_MSC_VER <= 600) -#define __cdecl _cdecl +/* + * 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 + +#else + +/* + * Other compilers (e.g., MIPS) + */ +#define _CRTAPI1 +#define _CRTAPI2 + #endif + /* define NULL pointer value */ #ifndef NULL @@ -30,7 +49,6 @@ extern "C" { #endif #endif - /* Locale categories */ #define LC_ALL 0 @@ -43,7 +61,6 @@ extern "C" { #define LC_MIN LC_ALL #define LC_MAX LC_TIME - /* Locale convention structure */ #ifndef _LCONV_DEFINED @@ -72,8 +89,8 @@ struct lconv { /* function prototypes */ -char * setlocale(int, const char *); -struct lconv * localeconv(void); +char * _CRTAPI1 setlocale(int, const char *); +struct lconv * _CRTAPI1 localeconv(void); #ifdef __cplusplus }