msvcrt: Add __cdecl to all function prototypes.
diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c
index 60c4264..a09f6f6 100644
--- a/dlls/crtdll/crtdll_main.c
+++ b/dlls/crtdll/crtdll_main.c
@@ -122,7 +122,6 @@
*/
int CDECL CRTDLL__fstat(int fd, struct crtdll_stat* buf)
{
- extern int _fstat(int,struct _stat*);
struct _stat st;
int ret;
@@ -136,7 +135,6 @@
*/
int CDECL CRTDLL__stat(const char* path, struct crtdll_stat * buf)
{
- extern int _stat(const char*,struct _stat*);
struct _stat st;
int ret;
diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c
index a273fe1..464c66b 100644
--- a/dlls/msvcrt/lock.c
+++ b/dlls/msvcrt/lock.c
@@ -18,11 +18,10 @@
#include <stdarg.h>
-#include "mtdll.h"
-
#include "wine/debug.h"
#include "windef.h"
#include "winbase.h"
+#include "mtdll.h"
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
diff --git a/dlls/msvcrt/mtdll.h b/dlls/msvcrt/mtdll.h
index b5473a5..c01beaf 100644
--- a/dlls/msvcrt/mtdll.h
+++ b/dlls/msvcrt/mtdll.h
@@ -24,8 +24,8 @@
#define _mlock(locknum) _lock(locknum)
#define _munlock(locknum) _unlock(locknum)
-void _unlock( int locknum );
-void _lock( int locknum );
+void __cdecl _unlock( int locknum );
+void __cdecl _lock( int locknum );
#else
diff --git a/include/msvcrt/conio.h b/include/msvcrt/conio.h
index 4384a37..7d4797b 100644
--- a/include/msvcrt/conio.h
+++ b/include/msvcrt/conio.h
@@ -14,23 +14,23 @@
extern "C" {
#endif
-char* _cgets(char*);
-int _cprintf(const char*,...);
-int _cputs(const char*);
-int _cscanf(const char*,...);
-int _getch(void);
-int _getche(void);
-int _kbhit(void);
-int _putch(int);
-int _ungetch(int);
+char* __cdecl _cgets(char*);
+int __cdecl _cprintf(const char*,...);
+int __cdecl _cputs(const char*);
+int __cdecl _cscanf(const char*,...);
+int __cdecl _getch(void);
+int __cdecl _getche(void);
+int __cdecl _kbhit(void);
+int __cdecl _putch(int);
+int __cdecl _ungetch(int);
#ifdef _M_IX86
-int _inp(unsigned short);
-unsigned long _inpd(unsigned short);
-unsigned short _inpw(unsigned short);
-int _outp(unsigned short, int);
-unsigned long _outpd(unsigned short, unsigned long);
-unsigned short _outpw(unsigned short, unsigned short);
+int __cdecl _inp(unsigned short);
+unsigned long __cdecl _inpd(unsigned short);
+unsigned short __cdecl _inpw(unsigned short);
+int __cdecl _outp(unsigned short, int);
+unsigned long __cdecl _outpd(unsigned short, unsigned long);
+unsigned short __cdecl _outpw(unsigned short, unsigned short);
#endif
#ifdef __cplusplus
@@ -53,8 +53,8 @@
#endif
#if defined(__GNUC__) && (__GNUC__ < 4)
-extern int cprintf(const char*,...) __attribute__((alias("_cprintf"),format(printf,1,2)));
-extern int cscanf(const char*,...) __attribute__((alias("_cscanf"),format(scanf,1,2)));
+extern int __cdecl cprintf(const char*,...) __attribute__((alias("_cprintf"),format(printf,1,2)));
+extern int __cdecl cscanf(const char*,...) __attribute__((alias("_cscanf"),format(scanf,1,2)));
#else
#define cprintf _cprintf
#define cscanf _cscanf
diff --git a/include/msvcrt/crtdbg.h b/include/msvcrt/crtdbg.h
index bd98449..83cd85e 100644
--- a/include/msvcrt/crtdbg.h
+++ b/include/msvcrt/crtdbg.h
@@ -84,14 +84,14 @@
extern int _crtBreakAlloc;
extern int _crtDbgFlag;
-int _CrtCheckMemory(void);
-int _CrtDbgReport(int reportType, const char *filename, int linenumber,
- const char *moduleName, const char *format, ...);
-int _CrtDumpMemoryLeaks(void);
-int _CrtSetBreakAlloc(int new);
-int _CrtSetDbgFlag(int new);
-void *_CrtSetDumpClient(void *dumpClient);
-int _CrtSetReportMode(int reportType, int reportMode);
+int __cdecl _CrtCheckMemory(void);
+int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber,
+ const char *moduleName, const char *format, ...);
+int __cdecl _CrtDumpMemoryLeaks(void);
+int __cdecl _CrtSetBreakAlloc(int new);
+int __cdecl _CrtSetDbgFlag(int new);
+void *__cdecl _CrtSetDumpClient(void *dumpClient);
+int __cdecl _CrtSetReportMode(int reportType, int reportMode);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h
index bbcdba9..b44e74c 100644
--- a/include/msvcrt/ctype.h
+++ b/include/msvcrt/ctype.h
@@ -30,46 +30,46 @@
#define _LEADBYTE 0x8000
#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */
-int __isascii(int);
-int __iscsym(int);
-int __iscsymf(int);
-int __toascii(int);
-int _isctype(int,int);
-int _tolower(int);
-int _toupper(int);
-int isalnum(int);
-int isalpha(int);
-int iscntrl(int);
-int isdigit(int);
-int isgraph(int);
-int islower(int);
-int isprint(int);
-int ispunct(int);
-int isspace(int);
-int isupper(int);
-int isxdigit(int);
-int tolower(int);
-int toupper(int);
+int __cdecl __isascii(int);
+int __cdecl __iscsym(int);
+int __cdecl __iscsymf(int);
+int __cdecl __toascii(int);
+int __cdecl _isctype(int,int);
+int __cdecl _tolower(int);
+int __cdecl _toupper(int);
+int __cdecl isalnum(int);
+int __cdecl isalpha(int);
+int __cdecl iscntrl(int);
+int __cdecl isdigit(int);
+int __cdecl isgraph(int);
+int __cdecl islower(int);
+int __cdecl isprint(int);
+int __cdecl ispunct(int);
+int __cdecl isspace(int);
+int __cdecl isupper(int);
+int __cdecl isxdigit(int);
+int __cdecl tolower(int);
+int __cdecl toupper(int);
#ifndef _WCTYPE_DEFINED
#define _WCTYPE_DEFINED
-int is_wctype(wint_t,wctype_t);
-int isleadbyte(int);
-int iswalnum(wint_t);
-int iswalpha(wint_t);
-int iswascii(wint_t);
-int iswcntrl(wint_t);
-int iswctype(wint_t,wctype_t);
-int iswdigit(wint_t);
-int iswgraph(wint_t);
-int iswlower(wint_t);
-int iswprint(wint_t);
-int iswpunct(wint_t);
-int iswspace(wint_t);
-int iswupper(wint_t);
-int iswxdigit(wint_t);
-wchar_t towlower(wchar_t);
-wchar_t towupper(wchar_t);
+int __cdecl is_wctype(wint_t,wctype_t);
+int __cdecl isleadbyte(int);
+int __cdecl iswalnum(wint_t);
+int __cdecl iswalpha(wint_t);
+int __cdecl iswascii(wint_t);
+int __cdecl iswcntrl(wint_t);
+int __cdecl iswctype(wint_t,wctype_t);
+int __cdecl iswdigit(wint_t);
+int __cdecl iswgraph(wint_t);
+int __cdecl iswlower(wint_t);
+int __cdecl iswprint(wint_t);
+int __cdecl iswpunct(wint_t);
+int __cdecl iswspace(wint_t);
+int __cdecl iswupper(wint_t);
+int __cdecl iswxdigit(wint_t);
+wchar_t __cdecl towlower(wchar_t);
+wchar_t __cdecl towupper(wchar_t);
#endif /* _WCTYPE_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/direct.h b/include/msvcrt/direct.h
index 4fc3943..dd5f421 100644
--- a/include/msvcrt/direct.h
+++ b/include/msvcrt/direct.h
@@ -26,22 +26,22 @@
};
#endif /* _DISKFREE_T_DEFINED */
-int _chdir(const char*);
-int _chdrive(int);
-char* _getcwd(char*,int);
-char* _getdcwd(int,char*,int);
-int _getdrive(void);
-unsigned long _getdrives(void);
-int _mkdir(const char*);
-int _rmdir(const char*);
+int __cdecl _chdir(const char*);
+int __cdecl _chdrive(int);
+char* __cdecl _getcwd(char*,int);
+char* __cdecl _getdcwd(int,char*,int);
+int __cdecl _getdrive(void);
+unsigned long __cdecl _getdrives(void);
+int __cdecl _mkdir(const char*);
+int __cdecl _rmdir(const char*);
#ifndef _WDIRECT_DEFINED
#define _WDIRECT_DEFINED
-int _wchdir(const wchar_t*);
-wchar_t* _wgetcwd(wchar_t*,int);
-wchar_t* _wgetdcwd(int,wchar_t*,int);
-int _wmkdir(const wchar_t*);
-int _wrmdir(const wchar_t*);
+int __cdecl _wchdir(const wchar_t*);
+wchar_t* __cdecl _wgetcwd(wchar_t*,int);
+wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int);
+int __cdecl _wmkdir(const wchar_t*);
+int __cdecl _wrmdir(const wchar_t*);
#endif /* _WDIRECT_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/dos.h b/include/msvcrt/dos.h
index c91468d..bc62188 100644
--- a/include/msvcrt/dos.h
+++ b/include/msvcrt/dos.h
@@ -36,7 +36,7 @@
extern "C" {
#endif
-unsigned int _getdiskfree(unsigned int, struct _diskfree_t *);
+unsigned int __cdecl _getdiskfree(unsigned int, struct _diskfree_t *);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/eh.h b/include/msvcrt/eh.h
index cadc8fe..932972f 100644
--- a/include/msvcrt/eh.h
+++ b/include/msvcrt/eh.h
@@ -30,18 +30,18 @@
struct _EXCEPTION_POINTERS;
-typedef void (*terminate_handler)(void);
-typedef void (*terminate_function)(void);
-typedef void (*unexpected_handler)(void);
-typedef void (*unexpected_function)(void);
-typedef void (*_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info);
+typedef void (__cdecl *terminate_handler)(void);
+typedef void (__cdecl *terminate_function)(void);
+typedef void (__cdecl *unexpected_handler)(void);
+typedef void (__cdecl *unexpected_function)(void);
+typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info);
-terminate_function set_terminate(terminate_function func);
-unexpected_function set_unexpected(unexpected_function func);
-_se_translator_function _set_se_translator(_se_translator_function func);
+terminate_function __cdecl set_terminate(terminate_function func);
+unexpected_function __cdecl set_unexpected(unexpected_function func);
+_se_translator_function __cdecl set_se_translator(_se_translator_function func);
-void terminate(void);
-void unexpected(void);
+void __cdecl terminate(void);
+void __cdecl unexpected(void);
#include <poppack.h>
diff --git a/include/msvcrt/errno.h b/include/msvcrt/errno.h
index 6214df9..115c5e4 100644
--- a/include/msvcrt/errno.h
+++ b/include/msvcrt/errno.h
@@ -65,7 +65,7 @@
extern "C" {
#endif
-extern int* _errno(void);
+extern int* __cdecl _errno(void);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h
index 3bb8746..b656e09 100644
--- a/include/msvcrt/float.h
+++ b/include/msvcrt/float.h
@@ -126,14 +126,14 @@
#define _FPE_STACKUNDERFLOW 0x8b
#define _FPE_EXPLICITGEN 0x8c
-double _copysign (double, double);
-double _chgsign (double);
-double _scalb(double, long);
-double _logb(double);
-double _nextafter(double, double);
-int _finite(double);
-int _isnan(double);
-int _fpclass(double);
+double __cdecl _copysign (double, double);
+double __cdecl _chgsign (double);
+double __cdecl _scalb(double, long);
+double __cdecl _logb(double);
+double __cdecl _nextafter(double, double);
+int __cdecl _finite(double);
+int __cdecl _isnan(double);
+int __cdecl _fpclass(double);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h
index 0b411fa..e9a970e 100644
--- a/include/msvcrt/io.h
+++ b/include/msvcrt/io.h
@@ -74,57 +74,57 @@
extern "C" {
#endif
-int _access(const char*,int);
-int _chmod(const char*,int);
-int _chsize(int,long);
-int _close(int);
-int _commit(int);
-int _creat(const char*,int);
-int _dup(int);
-int _dup2(int,int);
-int _eof(int);
-__int64 _filelengthi64(int);
-long _filelength(int);
-int _findclose(intptr_t);
-intptr_t _findfirst(const char*,struct _finddata_t*);
-intptr_t _findfirsti64(const char*, struct _finddatai64_t*);
-int _findnext(intptr_t,struct _finddata_t*);
-int _findnexti64(intptr_t, struct _finddatai64_t*);
-intptr_t _get_osfhandle(int);
-int _isatty(int);
-int _locking(int,int,long);
-long _lseek(int,long,int);
-__int64 _lseeki64(int,__int64,int);
-char* _mktemp(char*);
-int _open(const char*,int,...);
-int _open_osfhandle(intptr_t,int);
-int _pipe(int*,unsigned int,int);
-int _read(int,void*,unsigned int);
-int _setmode(int,int);
-int _sopen(const char*,int,int,...);
-long _tell(int);
-__int64 _telli64(int);
-int _umask(int);
-int _unlink(const char*);
-int _write(int,const void*,unsigned int);
+int __cdecl _access(const char*,int);
+int __cdecl _chmod(const char*,int);
+int __cdecl _chsize(int,long);
+int __cdecl _close(int);
+int __cdecl _commit(int);
+int __cdecl _creat(const char*,int);
+int __cdecl _dup(int);
+int __cdecl _dup2(int,int);
+int __cdecl _eof(int);
+__int64 __cdecl _filelengthi64(int);
+long __cdecl _filelength(int);
+int __cdecl _findclose(intptr_t);
+intptr_t __cdecl _findfirst(const char*,struct _finddata_t*);
+intptr_t __cdecl _findfirsti64(const char*, struct _finddatai64_t*);
+int __cdecl _findnext(intptr_t,struct _finddata_t*);
+int __cdecl _findnexti64(intptr_t, struct _finddatai64_t*);
+intptr_t __cdecl _get_osfhandle(int);
+int __cdecl _isatty(int);
+int __cdecl _locking(int,int,long);
+long __cdecl _lseek(int,long,int);
+__int64 __cdecl _lseeki64(int,__int64,int);
+char* __cdecl _mktemp(char*);
+int __cdecl _open(const char*,int,...);
+int __cdecl _open_osfhandle(intptr_t,int);
+int __cdecl _pipe(int*,unsigned int,int);
+int __cdecl _read(int,void*,unsigned int);
+int __cdecl _setmode(int,int);
+int __cdecl _sopen(const char*,int,int,...);
+long __cdecl _tell(int);
+__int64 __cdecl _telli64(int);
+int __cdecl _umask(int);
+int __cdecl _unlink(const char*);
+int __cdecl _write(int,const void*,unsigned int);
-int remove(const char*);
-int rename(const char*,const char*);
+int __cdecl remove(const char*);
+int __cdecl rename(const char*,const char*);
#ifndef _WIO_DEFINED
#define _WIO_DEFINED
-int _waccess(const wchar_t*,int);
-int _wchmod(const wchar_t*,int);
-int _wcreat(const wchar_t*,int);
-intptr_t _wfindfirst(const wchar_t*,struct _wfinddata_t*);
-intptr_t _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
-int _wfindnext(intptr_t,struct _wfinddata_t*);
-int _wfindnexti64(intptr_t, struct _wfinddatai64_t*);
-wchar_t*_wmktemp(wchar_t*);
-int _wopen(const wchar_t*,int,...);
-int _wrename(const wchar_t*,const wchar_t*);
-int _wsopen(const wchar_t*,int,int,...);
-int _wunlink(const wchar_t*);
+int __cdecl _waccess(const wchar_t*,int);
+int __cdecl _wchmod(const wchar_t*,int);
+int __cdecl _wcreat(const wchar_t*,int);
+intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*);
+intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
+int __cdecl _wfindnext(intptr_t,struct _wfinddata_t*);
+int __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*);
+wchar_t * __cdecl _wmktemp(wchar_t*);
+int __cdecl _wopen(const wchar_t*,int,...);
+int __cdecl _wrename(const wchar_t*,const wchar_t*);
+int __cdecl _wsopen(const wchar_t*,int,int,...);
+int __cdecl _wunlink(const wchar_t*);
#endif /* _WIO_DEFINED */
#ifdef __cplusplus
@@ -159,8 +159,8 @@
static inline int write(int fd, const void* buf, unsigned int size) { return _write(fd, buf, size); }
#if defined(__GNUC__) && (__GNUC__ < 4)
-extern int open(const char*,int,...) __attribute__((alias("_open")));
-extern int sopen(const char*,int,int,...) __attribute__((alias("_sopen")));
+extern int __cdecl open(const char*,int,...) __attribute__((alias("_open")));
+extern int __cdecl sopen(const char*,int,int,...) __attribute__((alias("_sopen")));
#else
#define open _open
#define sopen _sopen
diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h
index aaa3011..2b97c54 100644
--- a/include/msvcrt/locale.h
+++ b/include/msvcrt/locale.h
@@ -61,12 +61,12 @@
extern "C" {
#endif
-char* setlocale(int,const char*);
-struct lconv* localeconv(void);
+char* __cdecl setlocale(int,const char*);
+struct lconv* __cdecl localeconv(void);
#ifndef _WLOCALE_DEFINED
#define _WLOCALE_DEFINED
-wchar_t* _wsetlocale(int,const wchar_t*);
+wchar_t* __cdecl _wsetlocale(int,const wchar_t*);
#endif /* _WLOCALE_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h
index 60409c8..9224e4b 100644
--- a/include/msvcrt/malloc.h
+++ b/include/msvcrt/malloc.h
@@ -44,7 +44,7 @@
#endif /* _HEAPINFO_DEFINED */
#ifdef __i386__
-extern unsigned int* __p__amblksiz(void);
+extern unsigned int* __cdecl __p__amblksiz(void);
#define _amblksiz (*__p__amblksiz());
#else
extern unsigned int _amblksiz;
@@ -54,28 +54,28 @@
extern "C" {
#endif
-void* _expand(void*,size_t);
-int _heapadd(void*,size_t);
-int _heapchk(void);
-int _heapmin(void);
-int _heapset(unsigned int);
-size_t _heapused(size_t*,size_t*);
-int _heapwalk(_HEAPINFO*);
-size_t _msize(void*);
+void* __cdecl _expand(void*,size_t);
+int __cdecl _heapadd(void*,size_t);
+int __cdecl _heapchk(void);
+int __cdecl _heapmin(void);
+int __cdecl _heapset(unsigned int);
+size_t __cdecl _heapused(size_t*,size_t*);
+int __cdecl _heapwalk(_HEAPINFO*);
+size_t __cdecl _msize(void*);
-void* calloc(size_t,size_t);
-void free(void*);
-void* malloc(size_t);
-void* realloc(void*,size_t);
+void* __cdecl calloc(size_t,size_t);
+void __cdecl free(void*);
+void* __cdecl malloc(size_t);
+void* __cdecl realloc(void*,size_t);
-void _aligned_free(void*);
-void* _aligned_malloc(size_t,size_t);
-void* _aligned_offset_malloc(size_t,size_t,size_t);
-void* _aligned_realloc(void*,size_t,size_t);
-void* _aligned_offset_realloc(void*,size_t,size_t,size_t);
+void __cdecl _aligned_free(void*);
+void* __cdecl _aligned_malloc(size_t,size_t);
+void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t);
+void* __cdecl _aligned_realloc(void*,size_t,size_t);
+void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t);
-size_t _get_sbh_threshold(void);
-int _set_sbh_threshold(size_t size);
+size_t __cdecl _get_sbh_threshold(void);
+int __cdecl _set_sbh_threshold(size_t size);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h
index 5aaf7ab..a02378d 100644
--- a/include/msvcrt/math.h
+++ b/include/msvcrt/math.h
@@ -45,39 +45,39 @@
};
#endif /* _COMPLEX_DEFINED */
-double sin(double);
-double cos(double);
-double tan(double);
-double sinh(double);
-double cosh(double);
-double tanh(double);
-double asin(double);
-double acos(double);
-double atan(double);
-double atan2(double, double);
-double exp(double);
-double log(double);
-double log10(double);
-double pow(double, double);
-double sqrt(double);
-double ceil(double);
-double floor(double);
-double fabs(double);
-double ldexp(double, int);
-double frexp(double, int*);
-double modf(double, double*);
-double fmod(double, double);
+double __cdecl sin(double);
+double __cdecl cos(double);
+double __cdecl tan(double);
+double __cdecl sinh(double);
+double __cdecl cosh(double);
+double __cdecl tanh(double);
+double __cdecl asin(double);
+double __cdecl acos(double);
+double __cdecl atan(double);
+double __cdecl atan2(double, double);
+double __cdecl exp(double);
+double __cdecl log(double);
+double __cdecl log10(double);
+double __cdecl pow(double, double);
+double __cdecl sqrt(double);
+double __cdecl ceil(double);
+double __cdecl floor(double);
+double __cdecl fabs(double);
+double __cdecl ldexp(double, int);
+double __cdecl frexp(double, int*);
+double __cdecl modf(double, double*);
+double __cdecl fmod(double, double);
-double hypot(double, double);
-double j0(double);
-double j1(double);
-double jn(int, double);
-double y0(double);
-double y1(double);
-double yn(int, double);
+double __cdecl hypot(double, double);
+double __cdecl j0(double);
+double __cdecl j1(double);
+double __cdecl jn(int, double);
+double __cdecl y0(double);
+double __cdecl y1(double);
+double __cdecl yn(int, double);
-int _matherr(struct _exception*);
-double _cabs(struct _complex);
+int __cdecl _matherr(struct _exception*);
+double __cdecl _cabs(struct _complex);
#ifndef HUGE_VAL
# if defined(__GNUC__) && (__GNUC__ >= 3)
diff --git a/include/msvcrt/mbctype.h b/include/msvcrt/mbctype.h
index 7d38759..cb460b9 100644
--- a/include/msvcrt/mbctype.h
+++ b/include/msvcrt/mbctype.h
@@ -27,7 +27,7 @@
#endif
#ifdef __i386__
-unsigned char* __p__mbctype(void);
+unsigned char* __cdecl __p__mbctype(void);
#define _mbctype (__p__mbctype())
#else
extern unsigned char MSVCRT_mbctype[];
@@ -53,24 +53,24 @@
#define _MB_CP_ANSI -3
#define _MB_CP_LOCALE -4
-int _getmbcp(void);
-int _ismbbalnum(unsigned int);
-int _ismbbalpha(unsigned int);
-int _ismbbgraph(unsigned int);
-int _ismbbkalnum(unsigned int);
-int _ismbbkana(unsigned int);
-int _ismbbkprint(unsigned int);
-int _ismbbkpunct(unsigned int);
-int _ismbbprint(unsigned int);
-int _ismbbpunct(unsigned int);
-int _setmbcp(int);
+int __cdecl _getmbcp(void);
+int __cdecl _ismbbalnum(unsigned int);
+int __cdecl _ismbbalpha(unsigned int);
+int __cdecl _ismbbgraph(unsigned int);
+int __cdecl _ismbbkalnum(unsigned int);
+int __cdecl _ismbbkana(unsigned int);
+int __cdecl _ismbbkprint(unsigned int);
+int __cdecl _ismbbkpunct(unsigned int);
+int __cdecl _ismbbprint(unsigned int);
+int __cdecl _ismbbpunct(unsigned int);
+int __cdecl _setmbcp(int);
#ifndef _MBLEADTRAIL_DEFINED
#define _MBLEADTRAIL_DEFINED
-int _ismbblead(unsigned int);
-int _ismbbtrail(unsigned int);
-int _ismbslead(const unsigned char*,const unsigned char*);
-int _ismbstrail(const unsigned char*,const unsigned char*);
+int __cdecl _ismbblead(unsigned int);
+int __cdecl _ismbbtrail(unsigned int);
+int __cdecl _ismbslead(const unsigned char*,const unsigned char*);
+int __cdecl _ismbstrail(const unsigned char*,const unsigned char*);
#endif /* _MBLEADTRAIL_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h
index f4fa697..f3d7edf 100644
--- a/include/msvcrt/mbstring.h
+++ b/include/msvcrt/mbstring.h
@@ -33,85 +33,82 @@
extern "C" {
#endif
-int _ismbcalnum(unsigned int);
-int _ismbcalpha(unsigned int);
-int _ismbcdigit(unsigned int);
-int _ismbcgraph(unsigned int);
-int _ismbchira(unsigned int);
-int _ismbckata(unsigned int);
-int _ismbcl0(unsigned int);
-int _ismbcl1(unsigned int);
-int _ismbcl2(unsigned int);
-int _ismbclegal(unsigned int);
-int _ismbclower(unsigned int);
-int _ismbcprint(unsigned int);
-int _ismbcpunct(unsigned int);
-int _ismbcspace(unsigned int);
-int _ismbcsymbol(unsigned int);
-int _ismbcupper(unsigned int);
-unsigned int _mbbtombc(unsigned int);
-int _mbbtype(unsigned char,int);
-#define _mbccmp(_cpc1,_cpc2) _mbsncmp((_cpc1),(_cpc2),1)
-void _mbccpy(unsigned char*,const unsigned char*);
-unsigned int _mbcjistojms(unsigned int);
-unsigned int _mbcjmstojis(unsigned int);
-size_t _mbclen(const unsigned char*);
-unsigned int _mbctohira(unsigned int);
-unsigned int _mbctokata(unsigned int);
-unsigned int _mbctolower(unsigned int);
-unsigned int _mbctombb(unsigned int);
-unsigned int _mbctoupper(unsigned int);
-int _mbsbtype(const unsigned char*,size_t);
-unsigned char* _mbscat(unsigned char*,const unsigned char*);
-unsigned char* _mbschr(const unsigned char*,unsigned int);
-int _mbscmp(const unsigned char*,const unsigned char*);
-int _mbscoll(const unsigned char*,const unsigned char*);
-unsigned char* _mbscpy(unsigned char*,const unsigned char*);
-size_t _mbscspn(const unsigned char*,const unsigned char*);
-unsigned char* _mbsdec(const unsigned char*,const unsigned char*);
-unsigned char* _mbsdup(const unsigned char*);
-int _mbsicmp(const unsigned char*,const unsigned char*);
-int _mbsicoll(const unsigned char*,const unsigned char*);
-unsigned char* _mbsinc(const unsigned char*);
-size_t _mbslen(const unsigned char*);
-unsigned char* _mbslwr(unsigned char*);
-unsigned char* _mbsnbcat(unsigned char*,const unsigned char*,size_t);
-int _mbsnbcmp(const unsigned char*,const unsigned char*,size_t);
-int _mbsnbcoll(const unsigned char*,const unsigned char*,size_t);
-size_t _mbsnbcnt(const unsigned char*,size_t);
-unsigned char* _mbsnbcpy(unsigned char*,const unsigned char*
-,size_t);
-int _mbsnbicmp(const unsigned char*,const unsigned char*,size_t);
-int _mbsnbicoll(const unsigned char*,const unsigned char*,size_t);
-unsigned char* _mbsnbset(unsigned char*,unsigned int,size_t)
-;
-unsigned char* _mbsncat(unsigned char*,const unsigned char*,
- size_t);
-size_t _mbsnccnt(const unsigned char*,size_t);
-int _mbsncmp(const unsigned char*,const unsigned char*,size_t);
-int _mbsncoll(const unsigned char*,const unsigned char*,size_t);
-unsigned char* _mbsncpy(unsigned char*,const unsigned char*,size_t);
-unsigned int _mbsnextc (const unsigned char*);
-int _mbsnicmp(const unsigned char*,const unsigned char*,size_t);
-int _mbsnicoll(const unsigned char*,const unsigned char*,size_t);
-unsigned char* _mbsninc(const unsigned char*,size_t);
-unsigned char* _mbsnset(unsigned char*,unsigned int,size_t);
-unsigned char* _mbspbrk(const unsigned char*,const unsigned char*);
-unsigned char* _mbsrchr(const unsigned char*,unsigned int);
-unsigned char* _mbsrev(unsigned char*);
-unsigned char* _mbsset(unsigned char*,unsigned int);
-size_t _mbsspn(const unsigned char*,const unsigned char*);
-unsigned char* _mbsspnp(const unsigned char*,const unsigned char*);
-unsigned char* _mbsstr(const unsigned char*,const unsigned char*);
-unsigned char* _mbstok(unsigned char*,const unsigned char*);
-unsigned char* _mbsupr(unsigned char*);
+int __cdecl _ismbcalnum(unsigned int);
+int __cdecl _ismbcalpha(unsigned int);
+int __cdecl _ismbcdigit(unsigned int);
+int __cdecl _ismbcgraph(unsigned int);
+int __cdecl _ismbchira(unsigned int);
+int __cdecl _ismbckata(unsigned int);
+int __cdecl _ismbcl0(unsigned int);
+int __cdecl _ismbcl1(unsigned int);
+int __cdecl _ismbcl2(unsigned int);
+int __cdecl _ismbclegal(unsigned int);
+int __cdecl _ismbclower(unsigned int);
+int __cdecl _ismbcprint(unsigned int);
+int __cdecl _ismbcpunct(unsigned int);
+int __cdecl _ismbcspace(unsigned int);
+int __cdecl _ismbcsymbol(unsigned int);
+int __cdecl _ismbcupper(unsigned int);
+unsigned int __cdecl _mbbtombc(unsigned int);
+int __cdecl _mbbtype(unsigned char,int);
+#define _mbccmp(_cpc1,_cpc2) _mbsncmp((_cpc1),(_cpc2),1)
+void __cdecl _mbccpy(unsigned char*,const unsigned char*);
+unsigned int __cdecl _mbcjistojms(unsigned int);
+unsigned int __cdecl _mbcjmstojis(unsigned int);
+size_t __cdecl _mbclen(const unsigned char*);
+unsigned int __cdecl _mbctohira(unsigned int);
+unsigned int __cdecl _mbctokata(unsigned int);
+unsigned int __cdecl _mbctolower(unsigned int);
+unsigned int __cdecl _mbctombb(unsigned int);
+unsigned int __cdecl _mbctoupper(unsigned int);
+int __cdecl _mbsbtype(const unsigned char*,size_t);
+unsigned char* __cdecl _mbscat(unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbschr(const unsigned char*,unsigned int);
+int __cdecl _mbscmp(const unsigned char*,const unsigned char*);
+int __cdecl _mbscoll(const unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbscpy(unsigned char*,const unsigned char*);
+size_t __cdecl _mbscspn(const unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbsdec(const unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbsdup(const unsigned char*);
+int __cdecl _mbsicmp(const unsigned char*,const unsigned char*);
+int __cdecl _mbsicoll(const unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbsinc(const unsigned char*);
+size_t __cdecl _mbslen(const unsigned char*);
+unsigned char* __cdecl _mbslwr(unsigned char*);
+unsigned char* __cdecl _mbsnbcat(unsigned char*,const unsigned char*,size_t);
+int __cdecl _mbsnbcmp(const unsigned char*,const unsigned char*,size_t);
+int __cdecl _mbsnbcoll(const unsigned char*,const unsigned char*,size_t);
+size_t __cdecl _mbsnbcnt(const unsigned char*,size_t);
+unsigned char* __cdecl _mbsnbcpy(unsigned char*,const unsigned char*,size_t);
+int __cdecl _mbsnbicmp(const unsigned char*,const unsigned char*,size_t);
+int __cdecl _mbsnbicoll(const unsigned char*,const unsigned char*,size_t);
+unsigned char* __cdecl _mbsnbset(unsigned char*,unsigned int,size_t);
+unsigned char* __cdecl _mbsncat(unsigned char*,const unsigned char*, size_t);
+size_t __cdecl _mbsnccnt(const unsigned char*,size_t);
+int __cdecl _mbsncmp(const unsigned char*,const unsigned char*,size_t);
+int __cdecl _mbsncoll(const unsigned char*,const unsigned char*,size_t);
+unsigned char* __cdecl _mbsncpy(unsigned char*,const unsigned char*,size_t);
+unsigned int __cdecl _mbsnextc (const unsigned char*);
+int __cdecl _mbsnicmp(const unsigned char*,const unsigned char*,size_t);
+int __cdecl _mbsnicoll(const unsigned char*,const unsigned char*,size_t);
+unsigned char* __cdecl _mbsninc(const unsigned char*,size_t);
+unsigned char* __cdecl _mbsnset(unsigned char*,unsigned int,size_t);
+unsigned char* __cdecl _mbspbrk(const unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbsrchr(const unsigned char*,unsigned int);
+unsigned char* __cdecl _mbsrev(unsigned char*);
+unsigned char* __cdecl _mbsset(unsigned char*,unsigned int);
+size_t __cdecl _mbsspn(const unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbsspnp(const unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbsstr(const unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbstok(unsigned char*,const unsigned char*);
+unsigned char* __cdecl _mbsupr(unsigned char*);
#ifndef _MBLEADTRAIL_DEFINED
#define _MBLEADTRAIL_DEFINED
-int _ismbblead(unsigned int);
-int _ismbbtrail(unsigned int);
-int _ismbslead(const unsigned char*,const unsigned char*);
-int _ismbstrail(const unsigned char*,const unsigned char*);
+int __cdecl _ismbblead(unsigned int);
+int __cdecl _ismbbtrail(unsigned int);
+int __cdecl _ismbslead(const unsigned char*,const unsigned char*);
+int __cdecl _ismbstrail(const unsigned char*,const unsigned char*);
#endif /* _MBLEADTRAIL_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/memory.h b/include/msvcrt/memory.h
index d501ece..769fcfc 100644
--- a/include/msvcrt/memory.h
+++ b/include/msvcrt/memory.h
@@ -17,12 +17,12 @@
#ifndef _CRT_MEMORY_DEFINED
#define _CRT_MEMORY_DEFINED
-void* memchr(const void*,int,size_t);
-int memcmp(const void*,const void*,size_t);
-void* memcpy(void*,const void*,size_t);
-void* memset(void*,int,size_t);
-void* _memccpy(void*,const void*,int,unsigned int);
-int _memicmp(const void*,const void*,unsigned int);
+void* __cdecl memchr(const void*,int,size_t);
+int __cdecl memcmp(const void*,const void*,size_t);
+void* __cdecl memcpy(void*,const void*,size_t);
+void* __cdecl memset(void*,int,size_t);
+void* __cdecl _memccpy(void*,const void*,int,unsigned int);
+int __cdecl _memicmp(const void*,const void*,unsigned int);
static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); }
static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); }
diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h
index e9ac135..c02dbcf 100644
--- a/include/msvcrt/process.h
+++ b/include/msvcrt/process.h
@@ -27,55 +27,55 @@
typedef void (*_beginthread_start_routine_t)(void *);
typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *);
-uintptr_t _beginthread(_beginthread_start_routine_t,unsigned int,void*);
-uintptr_t _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*);
-intptr_t _cwait(int*,intptr_t,int);
-void _endthread(void);
-void _endthreadex(unsigned int);
-intptr_t _execl(const char*,const char*,...);
-intptr_t _execle(const char*,const char*,...);
-intptr_t _execlp(const char*,const char*,...);
-intptr_t _execlpe(const char*,const char*,...);
-intptr_t _execv(const char*,char* const *);
-intptr_t _execve(const char*,char* const *,const char* const *);
-intptr_t _execvp(const char*,char* const *);
-intptr_t _execvpe(const char*,char* const *,const char* const *);
-int _getpid(void);
-intptr_t _spawnl(int,const char*,const char*,...);
-intptr_t _spawnle(int,const char*,const char*,...);
-intptr_t _spawnlp(int,const char*,const char*,...);
-intptr_t _spawnlpe(int,const char*,const char*,...);
-intptr_t _spawnv(int,const char*,const char* const *);
-intptr_t _spawnve(int,const char*,const char* const *,const char* const *);
-intptr_t _spawnvp(int,const char*,const char* const *);
-intptr_t _spawnvpe(int,const char*,const char* const *,const char* const *);
+uintptr_t __cdecl _beginthread(_beginthread_start_routine_t,unsigned int,void*);
+uintptr_t __cdecl _beginthreadex(void*,unsigned int,_beginthreadex_start_routine_t,void*,unsigned int,unsigned int*);
+intptr_t __cdecl _cwait(int*,intptr_t,int);
+void __cdecl _endthread(void);
+void __cdecl _endthreadex(unsigned int);
+intptr_t __cdecl _execl(const char*,const char*,...);
+intptr_t __cdecl _execle(const char*,const char*,...);
+intptr_t __cdecl _execlp(const char*,const char*,...);
+intptr_t __cdecl _execlpe(const char*,const char*,...);
+intptr_t __cdecl _execv(const char*,char* const *);
+intptr_t __cdecl _execve(const char*,char* const *,const char* const *);
+intptr_t __cdecl _execvp(const char*,char* const *);
+intptr_t __cdecl _execvpe(const char*,char* const *,const char* const *);
+int __cdecl _getpid(void);
+intptr_t __cdecl _spawnl(int,const char*,const char*,...);
+intptr_t __cdecl _spawnle(int,const char*,const char*,...);
+intptr_t __cdecl _spawnlp(int,const char*,const char*,...);
+intptr_t __cdecl _spawnlpe(int,const char*,const char*,...);
+intptr_t __cdecl _spawnv(int,const char*,const char* const *);
+intptr_t __cdecl _spawnve(int,const char*,const char* const *,const char* const *);
+intptr_t __cdecl _spawnvp(int,const char*,const char* const *);
+intptr_t __cdecl _spawnvpe(int,const char*,const char* const *,const char* const *);
-void _c_exit(void);
-void _cexit(void);
-void _exit(int);
-void abort(void);
-void exit(int);
-int system(const char*);
+void __cdecl _c_exit(void);
+void __cdecl _cexit(void);
+void __cdecl _exit(int);
+void __cdecl abort(void);
+void __cdecl exit(int);
+int __cdecl system(const char*);
#ifndef _WPROCESS_DEFINED
#define _WPROCESS_DEFINED
-intptr_t _wexecl(const wchar_t*,const wchar_t*,...);
-intptr_t _wexecle(const wchar_t*,const wchar_t*,...);
-intptr_t _wexeclp(const wchar_t*,const wchar_t*,...);
-intptr_t _wexeclpe(const wchar_t*,const wchar_t*,...);
-intptr_t _wexecv(const wchar_t*,const wchar_t* const *);
-intptr_t _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-intptr_t _wexecvp(const wchar_t*,const wchar_t* const *);
-intptr_t _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-intptr_t _wspawnl(int,const wchar_t*,const wchar_t*,...);
-intptr_t _wspawnle(int,const wchar_t*,const wchar_t*,...);
-intptr_t _wspawnlp(int,const wchar_t*,const wchar_t*,...);
-intptr_t _wspawnlpe(int,const wchar_t*,const wchar_t*,...);
-intptr_t _wspawnv(int,const wchar_t*,const wchar_t* const *);
-intptr_t _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-intptr_t _wspawnvp(int,const wchar_t*,const wchar_t* const *);
-intptr_t _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-int _wsystem(const wchar_t*);
+intptr_t __cdecl _wexecl(const wchar_t*,const wchar_t*,...);
+intptr_t __cdecl _wexecle(const wchar_t*,const wchar_t*,...);
+intptr_t __cdecl _wexeclp(const wchar_t*,const wchar_t*,...);
+intptr_t __cdecl _wexeclpe(const wchar_t*,const wchar_t*,...);
+intptr_t __cdecl _wexecv(const wchar_t*,const wchar_t* const *);
+intptr_t __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
+intptr_t __cdecl _wexecvp(const wchar_t*,const wchar_t* const *);
+intptr_t __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
+intptr_t __cdecl _wspawnl(int,const wchar_t*,const wchar_t*,...);
+intptr_t __cdecl _wspawnle(int,const wchar_t*,const wchar_t*,...);
+intptr_t __cdecl _wspawnlp(int,const wchar_t*,const wchar_t*,...);
+intptr_t __cdecl _wspawnlpe(int,const wchar_t*,const wchar_t*,...);
+intptr_t __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *);
+intptr_t __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
+intptr_t __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *);
+intptr_t __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
+int __cdecl _wsystem(const wchar_t*);
#endif /* _WPROCESS_DEFINED */
#ifdef __cplusplus
@@ -104,14 +104,14 @@
static inline intptr_t spawnvpe(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnvpe(flags, name, argv, envv); }
#if defined(__GNUC__) && (__GNUC__ < 4)
-extern intptr_t execl(const char*,const char*,...) __attribute__((alias("_execl")));
-extern intptr_t execle(const char*,const char*,...) __attribute__((alias("_execle")));
-extern intptr_t execlp(const char*,const char*,...) __attribute__((alias("_execlp")));
-extern intptr_t execlpe(const char*,const char*,...) __attribute__((alias("_execlpe")));
-extern intptr_t spawnl(int,const char*,const char*,...) __attribute__((alias("_spawnl")));
-extern intptr_t spawnle(int,const char*,const char*,...) __attribute__((alias("_spawnle")));
-extern intptr_t spawnlp(int,const char*,const char*,...) __attribute__((alias("_spawnlp")));
-extern intptr_t spawnlpe(int,const char*,const char*,...) __attribute__((alias("_spawnlpe")));
+extern intptr_t __cdecl execl(const char*,const char*,...) __attribute__((alias("_execl")));
+extern intptr_t __cdecl execle(const char*,const char*,...) __attribute__((alias("_execle")));
+extern intptr_t __cdecl execlp(const char*,const char*,...) __attribute__((alias("_execlp")));
+extern intptr_t __cdecl execlpe(const char*,const char*,...) __attribute__((alias("_execlpe")));
+extern intptr_t __cdecl spawnl(int,const char*,const char*,...) __attribute__((alias("_spawnl")));
+extern intptr_t __cdecl spawnle(int,const char*,const char*,...) __attribute__((alias("_spawnle")));
+extern intptr_t __cdecl spawnlp(int,const char*,const char*,...) __attribute__((alias("_spawnlp")));
+extern intptr_t __cdecl spawnlpe(int,const char*,const char*,...) __attribute__((alias("_spawnlpe")));
#else
#define execl _execl
#define execle _execle
diff --git a/include/msvcrt/search.h b/include/msvcrt/search.h
index 6783374..16a0850 100644
--- a/include/msvcrt/search.h
+++ b/include/msvcrt/search.h
@@ -26,14 +26,10 @@
extern "C" {
#endif
-void* _lfind(const void*,const void*,unsigned int*,unsigned int,
- int (*)(const void*,const void*));
-void* _lsearch(const void*,void*,unsigned int*,unsigned int,
- int (*)(const void*,const void*));
-void* bsearch(const void*,const void*,size_t,size_t,
- int (*)(const void*,const void*));
-void qsort(void*,size_t,size_t,
- int (*)(const void*,const void*));
+void* __cdecl _lfind(const void*,const void*,unsigned int*,unsigned int,int (*)(const void*,const void*));
+void* __cdecl _lsearch(const void*,void*,unsigned int*,unsigned int,int (*)(const void*,const void*));
+void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (*)(const void*,const void*));
+void __cdecl qsort(void*,size_t,size_t,int (*)(const void*,const void*));
#ifdef __cplusplus
}
diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h
index a880739..82d7be6 100644
--- a/include/msvcrt/setjmp.h
+++ b/include/msvcrt/setjmp.h
@@ -53,8 +53,8 @@
extern "C" {
#endif
-int _setjmp(jmp_buf);
-int longjmp(jmp_buf,int);
+int __cdecl _setjmp(jmp_buf);
+int __cdecl longjmp(jmp_buf,int);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/signal.h b/include/msvcrt/signal.h
index 2ae6355..d9f72cc 100644
--- a/include/msvcrt/signal.h
+++ b/include/msvcrt/signal.h
@@ -36,14 +36,14 @@
extern "C" {
#endif
-typedef void (*__sighandler_t)(int);
+typedef void (__cdecl *__sighandler_t)(int);
#define SIG_DFL ((__sighandler_t)0)
#define SIG_IGN ((__sighandler_t)1)
#define SIG_ERR ((__sighandler_t)-1)
-__sighandler_t signal(int sig, __sighandler_t func);
-int raise(int sig);
+__sighandler_t __cdecl signal(int sig, __sighandler_t func);
+int __cdecl raise(int sig);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/stddef.h b/include/msvcrt/stddef.h
index c10fad1..7a0288e 100644
--- a/include/msvcrt/stddef.h
+++ b/include/msvcrt/stddef.h
@@ -41,9 +41,9 @@
extern "C" {
#endif
-unsigned long __threadid(void);
-unsigned long __threadhandle(void);
-#define _threadid (__threadid())
+unsigned long __cdecl __threadid(void);
+unsigned long __cdecl __threadhandle(void);
+#define _threadid (__threadid())
#ifdef __cplusplus
}
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index d608fdc..0f91947 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -81,7 +81,7 @@
#endif
#ifndef _STDIO_DEFINED
-FILE* __iob_func(void);
+FILE* __cdecl __iob_func(void);
# define _iob (__iob_func())
#endif /* _STDIO_DEFINED */
@@ -91,108 +91,108 @@
#ifndef _STDIO_DEFINED
#define _STDIO_DEFINED
-int _fcloseall(void);
-FILE* _fdopen(int,const char*);
-int _fgetchar(void);
-int _filbuf(FILE*);
-int _fileno(FILE*);
-int _flsbuf(int,FILE*);
-int _flushall(void);
-int _fputchar(int);
-FILE* _fsopen(const char*,const char*,int);
-int _getmaxstdio(void);
-int _getw(FILE*);
-int _pclose(FILE*);
-FILE* _popen(const char*,const char*);
-int _putw(int,FILE*);
-int _rmtmp(void);
-int _setmaxstdio(int);
-int _snprintf(char*,size_t,const char*,...);
-char* _tempnam(const char*,const char*);
-int _unlink(const char*);
-int _vsnprintf(char*,size_t,const char*,va_list);
+int __cdecl _fcloseall(void);
+FILE* __cdecl _fdopen(int,const char*);
+int __cdecl _fgetchar(void);
+int __cdecl _filbuf(FILE*);
+int __cdecl _fileno(FILE*);
+int __cdecl _flsbuf(int,FILE*);
+int __cdecl _flushall(void);
+int __cdecl _fputchar(int);
+FILE* __cdecl _fsopen(const char*,const char*,int);
+int __cdecl _getmaxstdio(void);
+int __cdecl _getw(FILE*);
+int __cdecl _pclose(FILE*);
+FILE* __cdecl _popen(const char*,const char*);
+int __cdecl _putw(int,FILE*);
+int __cdecl _rmtmp(void);
+int __cdecl _setmaxstdio(int);
+int __cdecl _snprintf(char*,size_t,const char*,...);
+char* __cdecl _tempnam(const char*,const char*);
+int __cdecl _unlink(const char*);
+int __cdecl _vsnprintf(char*,size_t,const char*,va_list);
-void clearerr(FILE*);
-int fclose(FILE*);
-int feof(FILE*);
-int ferror(FILE*);
-int fflush(FILE*);
-int fgetc(FILE*);
-int fgetpos(FILE*,fpos_t*);
-char* fgets(char*,int,FILE*);
-FILE* fopen(const char*,const char*);
-int fprintf(FILE*,const char*,...);
-int fputc(int,FILE*);
-int fputs(const char*,FILE*);
-size_t fread(void*,size_t,size_t,FILE*);
-FILE* freopen(const char*,const char*,FILE*);
-int fscanf(FILE*,const char*,...);
-int fseek(FILE*,long,int);
-int fsetpos(FILE*,fpos_t*);
-long ftell(FILE*);
-size_t fwrite(const void*,size_t,size_t,FILE*);
-int getc(FILE*);
-int getchar(void);
-char* gets(char*);
-void perror(const char*);
-int printf(const char*,...);
-int putc(int,FILE*);
-int putchar(int);
-int puts(const char*);
-int remove(const char*);
-int rename(const char*,const char*);
-void rewind(FILE*);
-int scanf(const char*,...);
-void setbuf(FILE*,char*);
-int setvbuf(FILE*,char*,int,size_t);
-int sprintf(char*,const char*,...);
-int sscanf(const char*,const char*,...);
-FILE* tmpfile(void);
-char* tmpnam(char*);
-int ungetc(int,FILE*);
-int vfprintf(FILE*,const char*,va_list);
-int vprintf(const char*,va_list);
-int vsprintf(char*,const char*,va_list);
+void __cdecl clearerr(FILE*);
+int __cdecl fclose(FILE*);
+int __cdecl feof(FILE*);
+int __cdecl ferror(FILE*);
+int __cdecl fflush(FILE*);
+int __cdecl fgetc(FILE*);
+int __cdecl fgetpos(FILE*,fpos_t*);
+char* __cdecl fgets(char*,int,FILE*);
+FILE* __cdecl fopen(const char*,const char*);
+int __cdecl fprintf(FILE*,const char*,...);
+int __cdecl fputc(int,FILE*);
+int __cdecl fputs(const char*,FILE*);
+size_t __cdecl fread(void*,size_t,size_t,FILE*);
+FILE* __cdecl freopen(const char*,const char*,FILE*);
+int __cdecl fscanf(FILE*,const char*,...);
+int __cdecl fseek(FILE*,long,int);
+int __cdecl fsetpos(FILE*,fpos_t*);
+long __cdecl ftell(FILE*);
+size_t __cdecl fwrite(const void*,size_t,size_t,FILE*);
+int __cdecl getc(FILE*);
+int __cdecl getchar(void);
+char* __cdecl gets(char*);
+void __cdecl perror(const char*);
+int __cdecl printf(const char*,...);
+int __cdecl putc(int,FILE*);
+int __cdecl putchar(int);
+int __cdecl puts(const char*);
+int __cdecl remove(const char*);
+int __cdecl rename(const char*,const char*);
+void __cdecl rewind(FILE*);
+int __cdecl scanf(const char*,...);
+void __cdecl setbuf(FILE*,char*);
+int __cdecl setvbuf(FILE*,char*,int,size_t);
+int __cdecl sprintf(char*,const char*,...);
+int __cdecl sscanf(const char*,const char*,...);
+FILE* __cdecl tmpfile(void);
+char* __cdecl tmpnam(char*);
+int __cdecl ungetc(int,FILE*);
+int __cdecl vfprintf(FILE*,const char*,va_list);
+int __cdecl vprintf(const char*,va_list);
+int __cdecl vsprintf(char*,const char*,va_list);
#ifndef _WSTDIO_DEFINED
#define _WSTDIO_DEFINED
-wint_t _fgetwchar(void);
-wint_t _fputwchar(wint_t);
-wchar_t*_getws(wchar_t*);
-int _putws(const wchar_t*);
-int _snwprintf(wchar_t*,size_t,const wchar_t*,...);
-int _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list);
-FILE* _wfdopen(int,const wchar_t*);
-FILE* _wfopen(const wchar_t*,const wchar_t*);
-FILE* _wfreopen(const wchar_t*,const wchar_t*,FILE*);
-FILE* _wfsopen(const wchar_t*,const wchar_t*,int);
-void _wperror(const wchar_t*);
-FILE* _wpopen(const wchar_t*,const wchar_t*);
-int _wremove(const wchar_t*);
-wchar_t*_wtempnam(const wchar_t*,const wchar_t*);
-wchar_t*_wtmpnam(wchar_t*);
+wint_t __cdecl _fgetwchar(void);
+wint_t __cdecl _fputwchar(wint_t);
+wchar_t* __cdecl _getws(wchar_t*);
+int __cdecl _putws(const wchar_t*);
+int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...);
+int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list);
+FILE* __cdecl _wfdopen(int,const wchar_t*);
+FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*);
+FILE* __cdecl _wfreopen(const wchar_t*,const wchar_t*,FILE*);
+FILE* __cdecl _wfsopen(const wchar_t*,const wchar_t*,int);
+void __cdecl _wperror(const wchar_t*);
+FILE* __cdecl _wpopen(const wchar_t*,const wchar_t*);
+int __cdecl _wremove(const wchar_t*);
+wchar_t* __cdecl _wtempnam(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl _wtmpnam(wchar_t*);
-wint_t fgetwc(FILE*);
-wchar_t*fgetws(wchar_t*,int,FILE*);
-wint_t fputwc(wint_t,FILE*);
-int fputws(const wchar_t*,FILE*);
-int fwprintf(FILE*,const wchar_t*,...);
-int fputws(const wchar_t*,FILE*);
-int fwscanf(FILE*,const wchar_t*,...);
-wint_t getwc(FILE*);
-wint_t getwchar(void);
-wchar_t*getws(wchar_t*);
-wint_t putwc(wint_t,FILE*);
-wint_t putwchar(wint_t);
-int putws(const wchar_t*);
-int swprintf(wchar_t*,const wchar_t*,...);
-int swscanf(const wchar_t*,const wchar_t*,...);
-wint_t ungetwc(wint_t,FILE*);
-int vfwprintf(FILE*,const wchar_t*,va_list);
-int vswprintf(wchar_t*,const wchar_t*,va_list);
-int vwprintf(const wchar_t*,va_list);
-int wprintf(const wchar_t*,...);
-int wscanf(const wchar_t*,...);
+wint_t __cdecl fgetwc(FILE*);
+wchar_t* __cdecl fgetws(wchar_t*,int,FILE*);
+wint_t __cdecl fputwc(wint_t,FILE*);
+int __cdecl fputws(const wchar_t*,FILE*);
+int __cdecl fwprintf(FILE*,const wchar_t*,...);
+int __cdecl fputws(const wchar_t*,FILE*);
+int __cdecl fwscanf(FILE*,const wchar_t*,...);
+wint_t __cdecl getwc(FILE*);
+wint_t __cdecl getwchar(void);
+wchar_t* __cdecl getws(wchar_t*);
+wint_t __cdecl putwc(wint_t,FILE*);
+wint_t __cdecl putwchar(wint_t);
+int __cdecl putws(const wchar_t*);
+int __cdecl swprintf(wchar_t*,const wchar_t*,...);
+int __cdecl swscanf(const wchar_t*,const wchar_t*,...);
+wint_t __cdecl ungetwc(wint_t,FILE*);
+int __cdecl vfwprintf(FILE*,const wchar_t*,va_list);
+int __cdecl vswprintf(wchar_t*,const wchar_t*,va_list);
+int __cdecl vwprintf(const wchar_t*,va_list);
+int __cdecl wprintf(const wchar_t*,...);
+int __cdecl wscanf(const wchar_t*,...);
#endif /* _WSTDIO_DEFINED */
#endif /* _STDIO_DEFINED */
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index 4222697..eae4d53 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -78,25 +78,25 @@
#ifdef __i386__
-extern unsigned int* __p__osver(void);
+extern unsigned int* __cdecl __p__osver(void);
#define _osver (*__p__osver())
-extern unsigned int* __p__winver(void);
+extern unsigned int* __cdecl __p__winver(void);
#define _winver (*__p__winver())
-extern unsigned int* __p__winmajor(void);
+extern unsigned int* __cdecl __p__winmajor(void);
#define _winmajor (*__p__winmajor())
-extern unsigned int* __p__winminor(void);
+extern unsigned int* __cdecl __p__winminor(void);
#define _winminor (*__p__winminor())
-extern int* __p___argc(void);
+extern int* __cdecl __p___argc(void);
#define __argc (*__p___argc())
-extern char*** __p___argv(void);
+extern char*** __cdecl __p___argv(void);
#define __argv (*__p___argv())
-extern wchar_t*** __p___wargv(void);
+extern wchar_t*** __cdecl __p___wargv(void);
#define __wargv (*__p___wargv())
-extern char*** __p__environ(void);
+extern char*** __cdecl __p__environ(void);
#define _environ (*__p__environ())
-extern wchar_t*** __p__wenviron(void);
+extern wchar_t*** __cdecl __p__wenviron(void);
#define _wenviron (*__p__wenviron())
-extern unsigned int* __p__fmode(void);
+extern unsigned int* __cdecl __p__fmode(void);
#define _fmode (*__p__fmode())
#else /* __i386__ */
@@ -114,12 +114,12 @@
#endif /* __i386__ */
-extern int* ___mb_cur_max_func(void);
-#define __mb_cur_max (*___mb_cur_max_func())
-extern unsigned long* __doserrno(void);
-#define _doserrno (*__doserrno())
-extern int* _errno(void);
-#define errno (*_errno())
+extern int* __cdecl ___mb_cur_max_func(void);
+#define __mb_cur_max (*___mb_cur_max_func())
+extern unsigned long* __cdecl __doserrno(void);
+#define _doserrno (*__doserrno())
+extern int* __cdecl _errno(void);
+#define errno (*_errno())
/* FIXME: We need functions to access these:
* int _sys_nerr;
@@ -127,97 +127,95 @@
*/
-typedef int (*_onexit_t)(void);
+typedef int (__cdecl *_onexit_t)(void);
-int _atodbl(_CRT_DOUBLE*,char*);
-int _atoflt(_CRT_FLOAT*,char*);
-__int64 _atoi64(const char*);
-long double _atold(const char*);
-int _atoldbl(_LDOUBLE*,char*);
-void _beep(unsigned int,unsigned int);
-char* _ecvt(double,int,int*,int*);
-char* _fcvt(double,int,int*,int*);
-char* _fullpath(char*,const char*,size_t);
-char* _gcvt(double,int,char*);
-char* _i64toa(__int64,char*,int);
-char* _itoa(int,char*,int);
-char* _ltoa(long,char*,int);
-unsigned long _lrotl(unsigned long,int);
-unsigned long _lrotr(unsigned long,int);
-void _makepath(char*,const char*,const char*,const char*,const char*);
-size_t _mbstrlen(const char*);
-_onexit_t _onexit(_onexit_t);
-int _putenv(const char*);
-unsigned int _rotl(unsigned int,int);
-unsigned int _rotr(unsigned int,int);
-void _searchenv(const char*,const char*,char*);
-int _set_error_mode(int);
-void _seterrormode(int);
-void _sleep(unsigned long);
-void _splitpath(const char*,char*,char*,char*,char*);
-long double _strtold(const char*,char**);
-void _swab(char*,char*,int);
-char* _ui64toa(unsigned __int64,char*,int);
-char* _ultoa(unsigned long,char*,int);
+int __cdecl _atodbl(_CRT_DOUBLE*,char*);
+int __cdecl _atoflt(_CRT_FLOAT*,char*);
+__int64 __cdecl _atoi64(const char*);
+long double __cdecl _atold(const char*);
+int __cdecl _atoldbl(_LDOUBLE*,char*);
+void __cdecl _beep(unsigned int,unsigned int);
+char* __cdecl _ecvt(double,int,int*,int*);
+char* __cdecl _fcvt(double,int,int*,int*);
+char* __cdecl _fullpath(char*,const char*,size_t);
+char* __cdecl _gcvt(double,int,char*);
+char* __cdecl _i64toa(__int64,char*,int);
+char* __cdecl _itoa(int,char*,int);
+char* __cdecl _ltoa(long,char*,int);
+unsigned long __cdecl _lrotl(unsigned long,int);
+unsigned long __cdecl _lrotr(unsigned long,int);
+void __cdecl _makepath(char*,const char*,const char*,const char*,const char*);
+size_t __cdecl _mbstrlen(const char*);
+_onexit_t __cdecl _onexit(_onexit_t);
+int __cdecl _putenv(const char*);
+unsigned int __cdecl _rotl(unsigned int,int);
+unsigned int __cdecl _rotr(unsigned int,int);
+void __cdecl _searchenv(const char*,const char*,char*);
+int __cdecl _set_error_mode(int);
+void __cdecl _seterrormode(int);
+void __cdecl _sleep(unsigned long);
+void __cdecl _splitpath(const char*,char*,char*,char*,char*);
+long double __cdecl _strtold(const char*,char**);
+void __cdecl _swab(char*,char*,int);
+char* __cdecl _ui64toa(unsigned __int64,char*,int);
+char* __cdecl _ultoa(unsigned long,char*,int);
-void _exit(int);
-void abort(void);
-int abs(int);
-int atexit(void (*)(void));
-double atof(const char*);
-int atoi(const char*);
-long atol(const char*);
-void* calloc(size_t,size_t);
+void __cdecl _exit(int);
+void __cdecl abort(void);
+int __cdecl abs(int);
+int __cdecl atexit(void (*)(void));
+double __cdecl atof(const char*);
+int __cdecl atoi(const char*);
+long __cdecl atol(const char*);
+void* __cdecl calloc(size_t,size_t);
#ifndef __i386__
-div_t div(int,int);
-ldiv_t ldiv(long,long);
+div_t __cdecl div(int,int);
+ldiv_t __cdecl ldiv(long,long);
#endif
-void exit(int);
-void free(void*);
-char* getenv(const char*);
-long labs(long);
-void* malloc(size_t);
-int mblen(const char*,size_t);
-void perror(const char*);
-int rand(void);
-void* realloc(void*,size_t);
-void srand(unsigned int);
-double strtod(const char*,char**);
-long strtol(const char*,char**,int);
-unsigned long strtoul(const char*,char**,int);
-int system(const char*);
-void* bsearch(const void*,const void*,size_t,size_t,
- int (*)(const void*,const void*));
-void qsort(void*,size_t,size_t,
- int (*)(const void*,const void*));
+void __cdecl exit(int);
+void __cdecl free(void*);
+char* __cdecl getenv(const char*);
+long __cdecl labs(long);
+void* __cdecl malloc(size_t);
+int __cdecl mblen(const char*,size_t);
+void __cdecl perror(const char*);
+int __cdecl rand(void);
+void* __cdecl realloc(void*,size_t);
+void __cdecl srand(unsigned int);
+double __cdecl strtod(const char*,char**);
+long __cdecl strtol(const char*,char**,int);
+unsigned long __cdecl strtoul(const char*,char**,int);
+int __cdecl system(const char*);
+void* __cdecl bsearch(const void*,const void*,size_t,size_t,int (*)(const void*,const void*));
+void __cdecl qsort(void*,size_t,size_t,int (*)(const void*,const void*));
#ifndef _WSTDLIB_DEFINED
#define _WSTDLIB_DEFINED
-wchar_t*_itow(int,wchar_t*,int);
-wchar_t*_i64tow(__int64,wchar_t*,int);
-wchar_t*_ltow(long,wchar_t*,int);
-wchar_t*_ui64tow(unsigned __int64,wchar_t*,int);
-wchar_t*_ultow(unsigned long,wchar_t*,int);
-wchar_t*_wfullpath(wchar_t*,const wchar_t*,size_t);
-wchar_t*_wgetenv(const wchar_t*);
-void _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*);
-void _wperror(const wchar_t*);
-int _wputenv(const wchar_t*);
-void _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*);
-void _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*);
-int _wsystem(const wchar_t*);
-int _wtoi(const wchar_t*);
-__int64 _wtoi64(const wchar_t*);
-long _wtol(const wchar_t*);
+wchar_t* __cdecl _itow(int,wchar_t*,int);
+wchar_t* __cdecl _i64tow(__int64,wchar_t*,int);
+wchar_t* __cdecl _ltow(long,wchar_t*,int);
+wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int);
+wchar_t* __cdecl _ultow(unsigned long,wchar_t*,int);
+wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl _wgetenv(const wchar_t*);
+void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*);
+void __cdecl _wperror(const wchar_t*);
+int __cdecl _wputenv(const wchar_t*);
+void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*);
+void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*);
+int __cdecl _wsystem(const wchar_t*);
+int __cdecl _wtoi(const wchar_t*);
+__int64 __cdecl _wtoi64(const wchar_t*);
+long __cdecl _wtol(const wchar_t*);
-size_t mbstowcs(wchar_t*,const char*,size_t);
-int mbtowc(wchar_t*,const char*,size_t);
-double wcstod(const wchar_t*,wchar_t**);
-long wcstol(const wchar_t*,wchar_t**,int);
-size_t wcstombs(char*,const wchar_t*,size_t);
-unsigned long wcstoul(const wchar_t*,wchar_t**,int);
-int wctomb(char*,wchar_t);
+size_t __cdecl mbstowcs(wchar_t*,const char*,size_t);
+int __cdecl mbtowc(wchar_t*,const char*,size_t);
+double __cdecl wcstod(const wchar_t*,wchar_t**);
+long __cdecl wcstol(const wchar_t*,wchar_t**,int);
+size_t __cdecl wcstombs(char*,const wchar_t*,size_t);
+unsigned long __cdecl wcstoul(const wchar_t*,wchar_t**,int);
+int __cdecl wctomb(char*,wchar_t);
#endif /* _WSTDLIB_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h
index 0a9a7a2..03bf4f8 100644
--- a/include/msvcrt/string.h
+++ b/include/msvcrt/string.h
@@ -29,76 +29,76 @@
#ifndef _CRT_MEMORY_DEFINED
#define _CRT_MEMORY_DEFINED
-void* memchr(const void*,int,size_t);
-int memcmp(const void*,const void*,size_t);
-void* memcpy(void*,const void*,size_t);
-void* memset(void*,int,size_t);
-void* _memccpy(void*,const void*,int,unsigned int);
-int _memicmp(const void*,const void*,unsigned int);
+void* __cdecl memchr(const void*,int,size_t);
+int __cdecl memcmp(const void*,const void*,size_t);
+void* __cdecl memcpy(void*,const void*,size_t);
+void* __cdecl memset(void*,int,size_t);
+void* __cdecl _memccpy(void*,const void*,int,unsigned int);
+int __cdecl _memicmp(const void*,const void*,unsigned int);
static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); }
static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); }
#endif /* _CRT_MEMORY_DEFINED */
-int _strcmpi(const char*,const char*);
-char* _strdup(const char*);
-char* _strerror(const char*);
-int _stricmp(const char*,const char*);
-int _stricoll(const char*,const char*);
-char* _strlwr(char*);
-int _strnicmp(const char*,const char*,size_t);
-char* _strnset(char*,int,size_t);
-char* _strrev(char*);
-char* _strset(char*,int);
-char* _strupr(char*);
+int __cdecl _strcmpi(const char*,const char*);
+char* __cdecl _strdup(const char*);
+char* __cdecl _strerror(const char*);
+int __cdecl _stricmp(const char*,const char*);
+int __cdecl _stricoll(const char*,const char*);
+char* __cdecl _strlwr(char*);
+int __cdecl _strnicmp(const char*,const char*,size_t);
+char* __cdecl _strnset(char*,int,size_t);
+char* __cdecl _strrev(char*);
+char* __cdecl _strset(char*,int);
+char* __cdecl _strupr(char*);
-void* memmove(void*,const void*,size_t);
-char* strcat(char*,const char*);
-char* strchr(const char*,int);
-int strcmp(const char*,const char*);
-int strcoll(const char*,const char*);
-char* strcpy(char*,const char*);
-size_t strcspn(const char*,const char*);
-char* strerror(int);
-size_t strlen(const char*);
-char* strncat(char*,const char*,size_t);
-int strncmp(const char*,const char*,size_t);
-char* strncpy(char*,const char*,size_t);
-char* strpbrk(const char*,const char*);
-char* strrchr(const char*,int);
-size_t strspn(const char*,const char*);
-char* strstr(const char*,const char*);
-char* strtok(char*,const char*);
-size_t strxfrm(char*,const char*,size_t);
+void* __cdecl memmove(void*,const void*,size_t);
+char* __cdecl strcat(char*,const char*);
+char* __cdecl strchr(const char*,int);
+int __cdecl strcmp(const char*,const char*);
+int __cdecl strcoll(const char*,const char*);
+char* __cdecl strcpy(char*,const char*);
+size_t __cdecl strcspn(const char*,const char*);
+char* __cdecl strerror(int);
+size_t __cdecl strlen(const char*);
+char* __cdecl strncat(char*,const char*,size_t);
+int __cdecl strncmp(const char*,const char*,size_t);
+char* __cdecl strncpy(char*,const char*,size_t);
+char* __cdecl strpbrk(const char*,const char*);
+char* __cdecl strrchr(const char*,int);
+size_t __cdecl strspn(const char*,const char*);
+char* __cdecl strstr(const char*,const char*);
+char* __cdecl strtok(char*,const char*);
+size_t __cdecl strxfrm(char*,const char*,size_t);
#ifndef _WSTRING_DEFINED
#define _WSTRING_DEFINED
-wchar_t*_wcsdup(const wchar_t*);
-int _wcsicmp(const wchar_t*,const wchar_t*);
-int _wcsicoll(const wchar_t*,const wchar_t*);
-wchar_t*_wcslwr(wchar_t*);
-int _wcsnicmp(const wchar_t*,const wchar_t*,size_t);
-wchar_t*_wcsnset(wchar_t*,wchar_t,size_t);
-wchar_t*_wcsrev(wchar_t*);
-wchar_t*_wcsset(wchar_t*,wchar_t);
-wchar_t*_wcsupr(wchar_t*);
+wchar_t* __cdecl _wcsdup(const wchar_t*);
+int __cdecl _wcsicmp(const wchar_t*,const wchar_t*);
+int __cdecl _wcsicoll(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl _wcslwr(wchar_t*);
+int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t);
+wchar_t* __cdecl _wcsrev(wchar_t*);
+wchar_t* __cdecl _wcsset(wchar_t*,wchar_t);
+wchar_t* __cdecl _wcsupr(wchar_t*);
-wchar_t*wcscat(wchar_t*,const wchar_t*);
-wchar_t*wcschr(const wchar_t*,wchar_t);
-int wcscmp(const wchar_t*,const wchar_t*);
-int wcscoll(const wchar_t*,const wchar_t*);
-wchar_t*wcscpy(wchar_t*,const wchar_t*);
-size_t wcscspn(const wchar_t*,const wchar_t*);
-size_t wcslen(const wchar_t*);
-wchar_t*wcsncat(wchar_t*,const wchar_t*,size_t);
-int wcsncmp(const wchar_t*,const wchar_t*,size_t);
-wchar_t*wcsncpy(wchar_t*,const wchar_t*,size_t);
-wchar_t*wcspbrk(const wchar_t*,const wchar_t*);
-wchar_t*wcsrchr(const wchar_t*,wchar_t wcFor);
-size_t wcsspn(const wchar_t*,const wchar_t*);
-wchar_t*wcsstr(const wchar_t*,const wchar_t*);
-wchar_t*wcstok(wchar_t*,const wchar_t*);
-size_t wcsxfrm(wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl wcscat(wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcschr(const wchar_t*,wchar_t);
+int __cdecl wcscmp(const wchar_t*,const wchar_t*);
+int __cdecl wcscoll(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcscpy(wchar_t*,const wchar_t*);
+size_t __cdecl wcscspn(const wchar_t*,const wchar_t*);
+size_t __cdecl wcslen(const wchar_t*);
+wchar_t* __cdecl wcsncat(wchar_t*,const wchar_t*,size_t);
+int __cdecl wcsncmp(const wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl wcsncpy(wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor);
+size_t __cdecl wcsspn(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*);
+size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t);
#endif /* _WSTRING_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h
index c29daf6..1712788 100644
--- a/include/msvcrt/sys/stat.h
+++ b/include/msvcrt/sys/stat.h
@@ -116,19 +116,19 @@
extern "C" {
#endif
-int _fstat(int,struct _stat*);
-int _stat(const char*,struct _stat*);
-int _fstati64(int,struct _stati64*);
-int _stati64(const char*,struct _stati64*);
-int _fstat64(int,struct _stat64*);
-int _stat64(const char*,struct _stat64*);
-int _umask(int);
+int __cdecl _fstat(int,struct _stat*);
+int __cdecl _stat(const char*,struct _stat*);
+int __cdecl _fstati64(int,struct _stati64*);
+int __cdecl _stati64(const char*,struct _stati64*);
+int __cdecl _fstat64(int,struct _stat64*);
+int __cdecl _stat64(const char*,struct _stat64*);
+int __cdecl _umask(int);
#ifndef _WSTAT_DEFINED
#define _WSTAT_DEFINED
-int _wstat(const wchar_t*,struct _stat*);
-int _wstati64(const wchar_t*,struct _stati64*);
-int _wstat64(const wchar_t*,struct _stat64*);
+int __cdecl _wstat(const wchar_t*,struct _stat*);
+int __cdecl _wstati64(const wchar_t*,struct _stati64*);
+int __cdecl _wstat64(const wchar_t*,struct _stat64*);
#endif /* _WSTAT_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/sys/timeb.h b/include/msvcrt/sys/timeb.h
index 3e2995a..a325913 100644
--- a/include/msvcrt/sys/timeb.h
+++ b/include/msvcrt/sys/timeb.h
@@ -40,7 +40,7 @@
extern "C" {
#endif
-void _ftime(struct _timeb*);
+void __cdecl _ftime(struct _timeb*);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/sys/utime.h b/include/msvcrt/sys/utime.h
index f1315b1..95b1f9b 100644
--- a/include/msvcrt/sys/utime.h
+++ b/include/msvcrt/sys/utime.h
@@ -37,10 +37,9 @@
extern "C" {
#endif
-int _futime(int,struct _utimbuf*);
-int _utime(const char*,struct _utimbuf*);
-
-int _wutime(const wchar_t*,struct _utimbuf*);
+int __cdecl _futime(int,struct _utimbuf*);
+int __cdecl _utime(const char*,struct _utimbuf*);
+int __cdecl _wutime(const wchar_t*,struct _utimbuf*);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h
index 52bbe4e..7b0eb4c 100644
--- a/include/msvcrt/time.h
+++ b/include/msvcrt/time.h
@@ -66,10 +66,10 @@
#define _timezone (*__p__timezone())
#define _tzname (__p__tzname())
-int *__p__daylight(void);
-long *__p__dstbias(void);
-long *__p__timezone(void);
-char **__p__tzname(void);
+int * __cdecl __p__daylight(void);
+long * __cdecl __p__dstbias(void);
+long * __cdecl __p__timezone(void);
+char ** __cdecl __p__tzname(void);
#else
extern int _daylight;
extern long _dstbias;
@@ -77,29 +77,29 @@
extern char *_tzname;
#endif
-unsigned _getsystime(struct tm*);
-unsigned _setsystime(struct tm*,unsigned);
-char* _strdate(char*);
-char* _strtime(char*);
-void _tzset(void);
+unsigned __cdecl _getsystime(struct tm*);
+unsigned __cdecl _setsystime(struct tm*,unsigned);
+char* __cdecl _strdate(char*);
+char* __cdecl _strtime(char*);
+void __cdecl _tzset(void);
-char* asctime(const struct tm*);
-clock_t clock(void);
-char* ctime(const time_t*);
-double difftime(time_t,time_t);
-struct tm* gmtime(const time_t*);
-struct tm* localtime(const time_t*);
-time_t mktime(struct tm*);
-size_t strftime(char*,size_t,const char*,const struct tm*);
-time_t time(time_t*);
+char* __cdecl asctime(const struct tm*);
+clock_t __cdecl clock(void);
+char* __cdecl ctime(const time_t*);
+double __cdecl difftime(time_t,time_t);
+struct tm* __cdecl gmtime(const time_t*);
+struct tm* __cdecl localtime(const time_t*);
+time_t __cdecl mktime(struct tm*);
+size_t __cdecl strftime(char*,size_t,const char*,const struct tm*);
+time_t __cdecl time(time_t*);
#ifndef _WTIME_DEFINED
#define _WTIME_DEFINED
-wchar_t* _wasctime(const struct tm*);
-size_t wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*);
-wchar_t*_wctime(const time_t*);
-wchar_t*_wstrdate(wchar_t*);
-wchar_t*_wstrtime(wchar_t*);
+wchar_t* __cdecl _wasctime(const struct tm*);
+size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*);
+wchar_t* __cdecl _wctime(const time_t*);
+wchar_t* __cdecl _wstrdate(wchar_t*);
+wchar_t* __cdecl _wstrtime(wchar_t*);
#endif /* _WTIME_DEFINED */
#ifdef __cplusplus
diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h
index dcefc0f..d966caa 100644
--- a/include/msvcrt/wchar.h
+++ b/include/msvcrt/wchar.h
@@ -191,198 +191,198 @@
#ifndef _WCTYPE_DEFINED
#define _WCTYPE_DEFINED
-int is_wctype(wint_t,wctype_t);
-int isleadbyte(int);
-int iswalnum(wint_t);
-int iswalpha(wint_t);
-int iswascii(wint_t);
-int iswcntrl(wint_t);
-int iswctype(wint_t,wctype_t);
-int iswdigit(wint_t);
-int iswgraph(wint_t);
-int iswlower(wint_t);
-int iswprint(wint_t);
-int iswpunct(wint_t);
-int iswspace(wint_t);
-int iswupper(wint_t);
-int iswxdigit(wint_t);
-wchar_t towlower(wchar_t);
-wchar_t towupper(wchar_t);
+int __cdecl is_wctype(wint_t,wctype_t);
+int __cdecl isleadbyte(int);
+int __cdecl iswalnum(wint_t);
+int __cdecl iswalpha(wint_t);
+int __cdecl iswascii(wint_t);
+int __cdecl iswcntrl(wint_t);
+int __cdecl iswctype(wint_t,wctype_t);
+int __cdecl iswdigit(wint_t);
+int __cdecl iswgraph(wint_t);
+int __cdecl iswlower(wint_t);
+int __cdecl iswprint(wint_t);
+int __cdecl iswpunct(wint_t);
+int __cdecl iswspace(wint_t);
+int __cdecl iswupper(wint_t);
+int __cdecl iswxdigit(wint_t);
+wchar_t __cdecl towlower(wchar_t);
+wchar_t __cdecl towupper(wchar_t);
#endif /* _WCTYPE_DEFINED */
#ifndef _WDIRECT_DEFINED
#define _WDIRECT_DEFINED
-int _wchdir(const wchar_t*);
-wchar_t* _wgetcwd(wchar_t*,int);
-wchar_t* _wgetdcwd(int,wchar_t*,int);
-int _wmkdir(const wchar_t*);
-int _wrmdir(const wchar_t*);
+int __cdecl _wchdir(const wchar_t*);
+wchar_t* __cdecl _wgetcwd(wchar_t*,int);
+wchar_t* __cdecl _wgetdcwd(int,wchar_t*,int);
+int __cdecl _wmkdir(const wchar_t*);
+int __cdecl _wrmdir(const wchar_t*);
#endif /* _WDIRECT_DEFINED */
#ifndef _WIO_DEFINED
#define _WIO_DEFINED
-int _waccess(const wchar_t*,int);
-int _wchmod(const wchar_t*,int);
-int _wcreat(const wchar_t*,int);
-long _wfindfirst(const wchar_t*,struct _wfinddata_t*);
-long _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
-int _wfindnext(long,struct _wfinddata_t*);
-int _wfindnexti64(long, struct _wfinddatai64_t*);
-wchar_t*_wmktemp(wchar_t*);
-int _wopen(const wchar_t*,int,...);
-int _wrename(const wchar_t*,const wchar_t*);
-int _wsopen(const wchar_t*,int,int,...);
-int _wunlink(const wchar_t*);
+int __cdecl _waccess(const wchar_t*,int);
+int __cdecl _wchmod(const wchar_t*,int);
+int __cdecl _wcreat(const wchar_t*,int);
+long __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*);
+long __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
+int __cdecl _wfindnext(long,struct _wfinddata_t*);
+int __cdecl _wfindnexti64(long, struct _wfinddatai64_t*);
+wchar_t* __cdecl _wmktemp(wchar_t*);
+int __cdecl _wopen(const wchar_t*,int,...);
+int __cdecl _wrename(const wchar_t*,const wchar_t*);
+int __cdecl _wsopen(const wchar_t*,int,int,...);
+int __cdecl _wunlink(const wchar_t*);
#endif /* _WIO_DEFINED */
#ifndef _WLOCALE_DEFINED
#define _WLOCALE_DEFINED
-wchar_t* _wsetlocale(int,const wchar_t*);
+wchar_t* __cdecl _wsetlocale(int,const wchar_t*);
#endif /* _WLOCALE_DEFINED */
#ifndef _WPROCESS_DEFINED
#define _WPROCESS_DEFINED
-int _wexecl(const wchar_t*,const wchar_t*,...);
-int _wexecle(const wchar_t*,const wchar_t*,...);
-int _wexeclp(const wchar_t*,const wchar_t*,...);
-int _wexeclpe(const wchar_t*,const wchar_t*,...);
-int _wexecv(const wchar_t*,const wchar_t* const *);
-int _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-int _wexecvp(const wchar_t*,const wchar_t* const *);
-int _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-int _wspawnl(int,const wchar_t*,const wchar_t*,...);
-int _wspawnle(int,const wchar_t*,const wchar_t*,...);
-int _wspawnlp(int,const wchar_t*,const wchar_t*,...);
-int _wspawnlpe(int,const wchar_t*,const wchar_t*,...);
-int _wspawnv(int,const wchar_t*,const wchar_t* const *);
-int _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-int _wspawnvp(int,const wchar_t*,const wchar_t* const *);
-int _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
-int _wsystem(const wchar_t*);
+int __cdecl _wexecl(const wchar_t*,const wchar_t*,...);
+int __cdecl _wexecle(const wchar_t*,const wchar_t*,...);
+int __cdecl _wexeclp(const wchar_t*,const wchar_t*,...);
+int __cdecl _wexeclpe(const wchar_t*,const wchar_t*,...);
+int __cdecl _wexecv(const wchar_t*,const wchar_t* const *);
+int __cdecl _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
+int __cdecl _wexecvp(const wchar_t*,const wchar_t* const *);
+int __cdecl _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *);
+int __cdecl _wspawnl(int,const wchar_t*,const wchar_t*,...);
+int __cdecl _wspawnle(int,const wchar_t*,const wchar_t*,...);
+int __cdecl _wspawnlp(int,const wchar_t*,const wchar_t*,...);
+int __cdecl _wspawnlpe(int,const wchar_t*,const wchar_t*,...);
+int __cdecl _wspawnv(int,const wchar_t*,const wchar_t* const *);
+int __cdecl _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
+int __cdecl _wspawnvp(int,const wchar_t*,const wchar_t* const *);
+int __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *);
+int __cdecl _wsystem(const wchar_t*);
#endif /* _WPROCESS_DEFINED */
#ifndef _WSTAT_DEFINED
#define _WSTAT_DEFINED
-int _wstat(const wchar_t*,struct _stat*);
-int _wstati64(const wchar_t*,struct _stati64*);
-int _wstat64(const wchar_t*,struct _stat64*);
+int __cdecl _wstat(const wchar_t*,struct _stat*);
+int __cdecl _wstati64(const wchar_t*,struct _stati64*);
+int __cdecl _wstat64(const wchar_t*,struct _stat64*);
#endif /* _WSTAT_DEFINED */
#ifndef _WSTDIO_DEFINED
#define _WSTDIO_DEFINED
-wint_t _fgetwchar(void);
-wint_t _fputwchar(wint_t);
-wchar_t*_getws(wchar_t*);
-int _putws(const wchar_t*);
-int _snwprintf(wchar_t*,size_t,const wchar_t*,...);
-int _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list);
-FILE* _wfdopen(int,const wchar_t*);
-FILE* _wfopen(const wchar_t*,const wchar_t*);
-FILE* _wfreopen(const wchar_t*,const wchar_t*,FILE*);
-FILE* _wfsopen(const wchar_t*,const wchar_t*,int);
-void _wperror(const wchar_t*);
-FILE* _wpopen(const wchar_t*,const wchar_t*);
-int _wremove(const wchar_t*);
-wchar_t*_wtempnam(const wchar_t*,const wchar_t*);
-wchar_t*_wtmpnam(wchar_t*);
+wint_t __cdecl _fgetwchar(void);
+wint_t __cdecl _fputwchar(wint_t);
+wchar_t* __cdecl _getws(wchar_t*);
+int __cdecl _putws(const wchar_t*);
+int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...);
+int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list);
+FILE* __cdecl _wfdopen(int,const wchar_t*);
+FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*);
+FILE* __cdecl _wfreopen(const wchar_t*,const wchar_t*,FILE*);
+FILE* __cdecl _wfsopen(const wchar_t*,const wchar_t*,int);
+void __cdecl _wperror(const wchar_t*);
+FILE* __cdecl _wpopen(const wchar_t*,const wchar_t*);
+int __cdecl _wremove(const wchar_t*);
+wchar_t* __cdecl _wtempnam(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl _wtmpnam(wchar_t*);
-wint_t fgetwc(FILE*);
-wchar_t*fgetws(wchar_t*,int,FILE*);
-wint_t fputwc(wint_t,FILE*);
-int fputws(const wchar_t*,FILE*);
-int fwprintf(FILE*,const wchar_t*,...);
-int fputws(const wchar_t*,FILE*);
-int fwscanf(FILE*,const wchar_t*,...);
-wint_t getwc(FILE*);
-wint_t getwchar(void);
-wchar_t*getws(wchar_t*);
-wint_t putwc(wint_t,FILE*);
-wint_t putwchar(wint_t);
-int putws(const wchar_t*);
-int swprintf(wchar_t*,const wchar_t*,...);
-int swscanf(const wchar_t*,const wchar_t*,...);
-wint_t ungetwc(wint_t,FILE*);
-int vfwprintf(FILE*,const wchar_t*,va_list);
-int vswprintf(wchar_t*,const wchar_t*,va_list);
-int vwprintf(const wchar_t*,va_list);
-int wprintf(const wchar_t*,...);
-int wscanf(const wchar_t*,...);
+wint_t __cdecl fgetwc(FILE*);
+wchar_t* __cdecl fgetws(wchar_t*,int,FILE*);
+wint_t __cdecl fputwc(wint_t,FILE*);
+int __cdecl fputws(const wchar_t*,FILE*);
+int __cdecl fwprintf(FILE*,const wchar_t*,...);
+int __cdecl fputws(const wchar_t*,FILE*);
+int __cdecl fwscanf(FILE*,const wchar_t*,...);
+wint_t __cdecl getwc(FILE*);
+wint_t __cdecl getwchar(void);
+wchar_t* __cdecl getws(wchar_t*);
+wint_t __cdecl putwc(wint_t,FILE*);
+wint_t __cdecl putwchar(wint_t);
+int __cdecl putws(const wchar_t*);
+int __cdecl swprintf(wchar_t*,const wchar_t*,...);
+int __cdecl swscanf(const wchar_t*,const wchar_t*,...);
+wint_t __cdecl ungetwc(wint_t,FILE*);
+int __cdecl vfwprintf(FILE*,const wchar_t*,va_list);
+int __cdecl vswprintf(wchar_t*,const wchar_t*,va_list);
+int __cdecl vwprintf(const wchar_t*,va_list);
+int __cdecl wprintf(const wchar_t*,...);
+int __cdecl wscanf(const wchar_t*,...);
#endif /* _WSTDIO_DEFINED */
#ifndef _WSTDLIB_DEFINED
#define _WSTDLIB_DEFINED
-wchar_t*_itow(int,wchar_t*,int);
-wchar_t*_i64tow(__int64,wchar_t*,int);
-wchar_t*_ltow(long,wchar_t*,int);
-wchar_t*_ui64tow(unsigned __int64,wchar_t*,int);
-wchar_t*_ultow(unsigned long,wchar_t*,int);
-wchar_t*_wfullpath(wchar_t*,const wchar_t*,size_t);
-wchar_t*_wgetenv(const wchar_t*);
-void _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*);
-void _wperror(const wchar_t*);
-int _wputenv(const wchar_t*);
-void _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*);
-void _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*);
-int _wsystem(const wchar_t*);
-int _wtoi(const wchar_t*);
-__int64 _wtoi64(const wchar_t*);
-long _wtol(const wchar_t*);
+wchar_t* __cdecl _itow(int,wchar_t*,int);
+wchar_t* __cdecl _i64tow(__int64,wchar_t*,int);
+wchar_t* __cdecl _ltow(long,wchar_t*,int);
+wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int);
+wchar_t* __cdecl _ultow(unsigned long,wchar_t*,int);
+wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl _wgetenv(const wchar_t*);
+void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*);
+void __cdecl _wperror(const wchar_t*);
+int __cdecl _wputenv(const wchar_t*);
+void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*);
+void __cdecl _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*);
+int __cdecl _wsystem(const wchar_t*);
+int __cdecl _wtoi(const wchar_t*);
+__int64 __cdecl _wtoi64(const wchar_t*);
+long __cdecl _wtol(const wchar_t*);
-size_t mbstowcs(wchar_t*,const char*,size_t);
-int mbtowc(wchar_t*,const char*,size_t);
-double wcstod(const wchar_t*,wchar_t**);
-long wcstol(const wchar_t*,wchar_t**,int);
-size_t wcstombs(char*,const wchar_t*,size_t);
-unsigned long wcstoul(const wchar_t*,wchar_t**,int);
-int wctomb(char*,wchar_t);
+size_t __cdecl mbstowcs(wchar_t*,const char*,size_t);
+int __cdecl mbtowc(wchar_t*,const char*,size_t);
+double __cdecl wcstod(const wchar_t*,wchar_t**);
+long __cdecl wcstol(const wchar_t*,wchar_t**,int);
+size_t __cdecl wcstombs(char*,const wchar_t*,size_t);
+unsigned long __cdecl wcstoul(const wchar_t*,wchar_t**,int);
+int __cdecl wctomb(char*,wchar_t);
#endif /* _WSTDLIB_DEFINED */
#ifndef _WSTRING_DEFINED
#define _WSTRING_DEFINED
-wchar_t*_wcsdup(const wchar_t*);
-int _wcsicmp(const wchar_t*,const wchar_t*);
-int _wcsicoll(const wchar_t*,const wchar_t*);
-wchar_t*_wcslwr(wchar_t*);
-int _wcsnicmp(const wchar_t*,const wchar_t*,size_t);
-wchar_t*_wcsnset(wchar_t*,wchar_t,size_t);
-wchar_t*_wcsrev(wchar_t*);
-wchar_t*_wcsset(wchar_t*,wchar_t);
-wchar_t*_wcsupr(wchar_t*);
+wchar_t* __cdecl _wcsdup(const wchar_t*);
+int __cdecl _wcsicmp(const wchar_t*,const wchar_t*);
+int __cdecl _wcsicoll(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl _wcslwr(wchar_t*);
+int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t);
+wchar_t* __cdecl _wcsrev(wchar_t*);
+wchar_t* __cdecl _wcsset(wchar_t*,wchar_t);
+wchar_t* __cdecl _wcsupr(wchar_t*);
-wchar_t*wcscat(wchar_t*,const wchar_t*);
-wchar_t*wcschr(const wchar_t*,wchar_t);
-int wcscmp(const wchar_t*,const wchar_t*);
-int wcscoll(const wchar_t*,const wchar_t*);
-wchar_t*wcscpy(wchar_t*,const wchar_t*);
-size_t wcscspn(const wchar_t*,const wchar_t*);
-size_t wcslen(const wchar_t*);
-wchar_t*wcsncat(wchar_t*,const wchar_t*,size_t);
-int wcsncmp(const wchar_t*,const wchar_t*,size_t);
-wchar_t*wcsncpy(wchar_t*,const wchar_t*,size_t);
-wchar_t*wcspbrk(const wchar_t*,const wchar_t*);
-wchar_t*wcsrchr(const wchar_t*,wchar_t wcFor);
-size_t wcsspn(const wchar_t*,const wchar_t*);
-wchar_t*wcsstr(const wchar_t*,const wchar_t*);
-wchar_t*wcstok(wchar_t*,const wchar_t*);
-size_t wcsxfrm(wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl wcscat(wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcschr(const wchar_t*,wchar_t);
+int __cdecl wcscmp(const wchar_t*,const wchar_t*);
+int __cdecl wcscoll(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcscpy(wchar_t*,const wchar_t*);
+size_t __cdecl wcscspn(const wchar_t*,const wchar_t*);
+size_t __cdecl wcslen(const wchar_t*);
+wchar_t* __cdecl wcsncat(wchar_t*,const wchar_t*,size_t);
+int __cdecl wcsncmp(const wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl wcsncpy(wchar_t*,const wchar_t*,size_t);
+wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor);
+size_t __cdecl wcsspn(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcsstr(const wchar_t*,const wchar_t*);
+wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*);
+size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t);
#endif /* _WSTRING_DEFINED */
#ifndef _WTIME_DEFINED
#define _WTIME_DEFINED
-wchar_t*_wasctime(const struct tm*);
-size_t wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*);
-wchar_t*_wctime(const time_t*);
-wchar_t*_wstrdate(wchar_t*);
-wchar_t*_wstrtime(wchar_t*);
+wchar_t* __cdecl _wasctime(const struct tm*);
+size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*);
+wchar_t* __cdecl _wctime(const time_t*);
+wchar_t* __cdecl _wstrdate(wchar_t*);
+wchar_t* __cdecl _wstrtime(wchar_t*);
#endif /* _WTIME_DEFINED */
-wchar_t btowc(int);
-size_t mbrlen(const char *,size_t,mbstate_t*);
-size_t mbrtowc(wchar_t*,const char*,size_t,mbstate_t*);
-size_t mbsrtowcs(wchar_t*,const char**,size_t,mbstate_t*);
-size_t wcrtomb(char*,wchar_t,mbstate_t*);
-size_t wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*);
-int wctob(wint_t);
+wchar_t __cdecl btowc(int);
+size_t __cdecl mbrlen(const char *,size_t,mbstate_t*);
+size_t __cdecl mbrtowc(wchar_t*,const char*,size_t,mbstate_t*);
+size_t __cdecl mbsrtowcs(wchar_t*,const char**,size_t,mbstate_t*);
+size_t __cdecl wcrtomb(char*,wchar_t,mbstate_t*);
+size_t __cdecl wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*);
+int __cdecl wctob(wint_t);
#ifdef __cplusplus
}
diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h
index feebb77..d6bed60 100644
--- a/include/msvcrt/wctype.h
+++ b/include/msvcrt/wctype.h
@@ -49,23 +49,23 @@
#ifndef _WCTYPE_DEFINED
#define _WCTYPE_DEFINED
-int is_wctype(wint_t,wctype_t);
-int isleadbyte(int);
-int iswalnum(wint_t);
-int iswalpha(wint_t);
-int iswascii(wint_t);
-int iswcntrl(wint_t);
-int iswctype(wint_t,wctype_t);
-int iswdigit(wint_t);
-int iswgraph(wint_t);
-int iswlower(wint_t);
-int iswprint(wint_t);
-int iswpunct(wint_t);
-int iswspace(wint_t);
-int iswupper(wint_t);
-int iswxdigit(wint_t);
-wchar_t towlower(wchar_t);
-wchar_t towupper(wchar_t);
+int __cdecl is_wctype(wint_t,wctype_t);
+int __cdecl isleadbyte(int);
+int __cdecl iswalnum(wint_t);
+int __cdecl iswalpha(wint_t);
+int __cdecl iswascii(wint_t);
+int __cdecl iswcntrl(wint_t);
+int __cdecl iswctype(wint_t,wctype_t);
+int __cdecl iswdigit(wint_t);
+int __cdecl iswgraph(wint_t);
+int __cdecl iswlower(wint_t);
+int __cdecl iswprint(wint_t);
+int __cdecl iswpunct(wint_t);
+int __cdecl iswspace(wint_t);
+int __cdecl iswupper(wint_t);
+int __cdecl iswxdigit(wint_t);
+wchar_t __cdecl towlower(wchar_t);
+wchar_t __cdecl towupper(wchar_t);
#endif /* _WCTYPE_DEFINED */
#ifdef __cplusplus
