From a8d0071db215b290e5a5f94133ee30e405fff216 Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Fri, 3 Aug 2012 16:06:45 +0000 Subject: [PATCH] * include/wchar.h (_wcstrtoi64): Declare. (_wcstrtoi64_l): Ditto. (_wcstrtoui64): Ditto. (_wcstrtoui64_l): Ditto. --- winsup/mingw/ChangeLog | 4 ++++ winsup/mingw/include/stdlib.h | 8 ++++---- winsup/mingw/include/wchar.h | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 0eaa00254..a0a367d01 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -8,6 +8,10 @@ (_wcstrtoi64_l): Ditto. (_wcstrtoui64): Ditto. (_wcstrtoui64_l): Ditto. + * include/wchar.h (_wcstrtoi64): Ditto. + (_wcstrtoi64_l): Ditto. + (_wcstrtoui64): Ditto. + (_wcstrtoui64_l): Ditto. 2012-08-01 Earnie Boyd diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h index 726aa6fd2..ece21cb44 100644 --- a/winsup/mingw/include/stdlib.h +++ b/winsup/mingw/include/stdlib.h @@ -302,12 +302,8 @@ __MINGW_IMPORT int _fmode_dll; _CRTIMP __int64 __cdecl _strtoi64(const char*, char **, int); _CRTIMP __int64 __cdecl _strtoi64_l(const char *, char **, int, _locale_t); -_CRTIMP __int64 __cdecl _wcstoi64(const wchar_t *, wchar_t **, int); -_CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *, wchar_t **, int, _locale_t); _CRTIMP unsigned __int64 __cdecl _strtoui64(const char*, char **, int); _CRTIMP unsigned __int64 __cdecl _strtoui64_l(const char *, char **, int, _locale_t); -_CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *, wchar_t **, int); -_CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *, wchar_t **, int, _locale_t); _CRTIMP double __cdecl __MINGW_NOTHROW atof (const char*); _CRTIMP int __cdecl __MINGW_NOTHROW atoi (const char*); @@ -332,6 +328,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW strtoul (const char*, char**, int) #ifndef _WSTDLIB_DEFINED /* also declared in wchar.h */ +_CRTIMP __int64 __cdecl _wcstoi64(const wchar_t *, wchar_t **, int); +_CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *, wchar_t **, int, _locale_t); +_CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *, wchar_t **, int); +_CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *, wchar_t **, int, _locale_t); _CRTIMP long __cdecl __MINGW_NOTHROW wcstol (const wchar_t*, wchar_t**, int); _CRTIMP unsigned long __cdecl __MINGW_NOTHROW wcstoul (const wchar_t*, wchar_t**, int); _CRTIMP double __cdecl __MINGW_NOTHROW wcstod (const wchar_t*, wchar_t**); diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h index 60e8d9c2b..dadeda6d3 100644 --- a/winsup/mingw/include/wchar.h +++ b/winsup/mingw/include/wchar.h @@ -177,6 +177,10 @@ _CRTIMP void __cdecl __MINGW_NOTHROW _wmakepath(wchar_t*, const wchar_t*, const _CRTIMP void __cdecl __MINGW_NOTHROW _wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*); _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wfullpath (wchar_t*, const wchar_t*, size_t); #endif +_CRTIMP __int64 __cdecl _wcstoi64(const wchar_t *, wchar_t **, int); +_CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *, wchar_t **, int, _locale_t); +_CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *, wchar_t **, int); +_CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *, wchar_t **, int, _locale_t); #define _WSTDLIB_DEFINED #endif /* _WSTDLIB_DEFINED */