Merge from trunk rev. 4299: 2011-07-26 Kai Tietz <kai.tietz@onevision.com> misc/_wctime32.c: Fix symbol to use _wctime instead of wctime (which isn't present). git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/branches/releases/v1.0@4300 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog index 6dffeb4..2701369 100644 --- a/mingw-w64-crt/ChangeLog +++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,10 @@ +2011-07-26 Ozkan Sezer <sezeroz@gmail.com> + + Merge from trunk rev. 4299: + 2011-07-26 Kai Tietz <kai.tietz@onevision.com> + * misc/_wctime32.c: Fix symbol to use _wctime instead of wctime + (which isn't present). + 2011-07-23 Ozkan Sezer <sezeroz@gmail.com> Merged from trunk rev. 4284:
diff --git a/mingw-w64-crt/misc/_wctime32.c b/mingw-w64-crt/misc/_wctime32.c index b713094..b386d33 100644 --- a/mingw-w64-crt/misc/_wctime32.c +++ b/mingw-w64-crt/misc/_wctime32.c
@@ -8,10 +8,10 @@ #endif #include <time.h> -extern wchar_t * (__cdecl *__MINGW_IMP_SYMBOL(wctime))(const __time32_t *); +extern wchar_t * (__cdecl *__MINGW_IMP_SYMBOL(_wctime))(const __time32_t *); wchar_t *__cdecl _wctime32(const __time32_t *_Time) { - return (*__MINGW_IMP_SYMBOL(wctime))(_Time); + return (*__MINGW_IMP_SYMBOL(_wctime))(_Time); }