* include/wchar.h (_wcstrtoi64): Declare.

	(_wcstrtoi64_l): Ditto.
	(_wcstrtoui64): Ditto.
	(_wcstrtoui64_l): Ditto.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 0eaa00254398f54fe6747e56afbbd2bf9f11605d..a0a367d0176d400e59f84c61b17df461b2cfe7da 100644 (file)
--- 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  <earnie@users.sourceforge.net>
 

diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h
index 726aa6fd24b274d7513d49036cf548034b6e3dd3..ece21cb4418367f45f50045056a960f5dfcd25b6 100644 (file)
--- 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 60e8d9c2b9c32bc38702314b7bcbdbb22507a33f..dadeda6d3dfe6bc9876303340032a3a0bb18d9c0 100644 (file)
--- 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 */