From: <wa...@us...> - 2013-04-04 10:22:29
|
Revision: 5721 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5721&view=rev Author: wavael Date: 2013-04-04 10:22:16 +0000 (Thu, 04 Apr 2013) Log Message: ----------- Provide localtime/_localtime32/_localtime64 for all msvcrt versions through .def files Remove localtime/_localtime32 .c replacements Modified Paths: -------------- trunk/mingw-w64-crt/Makefile.am trunk/mingw-w64-crt/lib32/msvcr100.def trunk/mingw-w64-crt/lib32/msvcr110.def trunk/mingw-w64-crt/lib32/msvcr80.def trunk/mingw-w64-crt/lib32/msvcr90.def trunk/mingw-w64-crt/lib32/msvcr90d.def trunk/mingw-w64-crt/lib32/msvcrt.def trunk/mingw-w64-crt/lib64/msvcr100.def trunk/mingw-w64-crt/lib64/msvcr110.def trunk/mingw-w64-crt/lib64/msvcr80.def trunk/mingw-w64-crt/lib64/msvcr90.def trunk/mingw-w64-crt/lib64/msvcr90d.def trunk/mingw-w64-crt/lib64/msvcrt.def Removed Paths: ------------- trunk/mingw-w64-crt/misc/_localtime32.c trunk/mingw-w64-crt/misc/localtime.c Modified: trunk/mingw-w64-crt/Makefile.am =================================================================== --- trunk/mingw-w64-crt/Makefile.am 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/Makefile.am 2013-04-04 10:22:16 UTC (rev 5721) @@ -175,7 +175,7 @@ math/powi.def.h math/sin.def.h math/sqrt.def.h \ math/cephes_emath.h math/cephes_mconf.h math/fastmath.h math/fp_consts.h math/abs64.c \ \ - misc/_localtime32.c misc/_mkgmtime.c misc/_mkgmtime32.c \ + misc/_mkgmtime.c misc/_mkgmtime32.c \ misc/alarm.c \ misc/basename.c misc/btowc.c misc/delay-f.c misc/delay-n.c \ misc/delayimp.c misc/difftime.c misc/difftime32.c misc/difftime64.c misc/dirent.c \ @@ -184,7 +184,7 @@ misc/feraiseexcept.c misc/fesetenv.c misc/fesetexceptflag.c misc/fesetround.c misc/fetestexcept.c \ misc/feupdateenv.c misc/ftruncate.c misc/fwide.c misc/getlogin.c misc/getopt.c \ misc/gettimeofday.c misc/imaxabs.c misc/imaxdiv.c misc/isblank.c \ - misc/iswblank.c misc/localtime.c misc/mb_wc_common.h misc/mbrtowc.c misc/mbsinit.c \ + misc/iswblank.c misc/mb_wc_common.h misc/mbrtowc.c misc/mbsinit.c \ misc/mempcpy.c misc/mingw-aligned-malloc.c misc/mingw-fseek.c misc/mingw_get_codepage.c misc/mingw_getsp.S \ misc/mingw_matherr.c misc/mingw_mbwc_convert.c misc/mingw_output_format.c misc/mingw_usleep.c misc/mingw_wcstod.c \ misc/mingw_wcstof.c misc/mingw_wcstold.c misc/seterrno.c misc/sleep.c \ Modified: trunk/mingw-w64-crt/lib32/msvcr100.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr100.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib32/msvcr100.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -1075,7 +1075,8 @@ _loaddll _local_unwind2 _local_unwind4 -_localtime32 DATA +_localtime32 +localtime == _localtime32 _localtime32_s _localtime64 _localtime64_s Modified: trunk/mingw-w64-crt/lib32/msvcr110.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr110.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib32/msvcr110.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -1209,6 +1209,7 @@ _local_unwind2 _local_unwind4 _localtime32 +localtime == _localtime32 _localtime32_s _localtime64 _localtime64_s Modified: trunk/mingw-w64-crt/lib32/msvcr80.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr80.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib32/msvcr80.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -601,8 +601,8 @@ ldexp DATA ldiv localeconv -localtime DATA -;_localtime32 = localtime +localtime == _localtime32 +_localtime32 log DATA log10 longjmp DATA Modified: trunk/mingw-w64-crt/lib32/msvcr90.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr90.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib32/msvcr90.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -703,7 +703,8 @@ _loaddll _local_unwind2 _local_unwind4 -_localtime32 DATA +_localtime32 +localtime == _localtime32 _localtime32_s _localtime64 _localtime64_s Modified: trunk/mingw-w64-crt/lib32/msvcr90d.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr90d.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib32/msvcr90d.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -766,6 +766,7 @@ _local_unwind2 _local_unwind4 _localtime32 +localtime == _localtime32 _localtime32_s _localtime64 _localtime64_s Modified: trunk/mingw-w64-crt/lib32/msvcrt.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcrt.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib32/msvcrt.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -603,8 +603,8 @@ ldexp DATA ldiv localeconv -localtime DATA -;_localtime32 = localtime +localtime +_localtime32 == localtime log DATA log10 longjmp DATA Modified: trunk/mingw-w64-crt/lib64/msvcr100.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr100.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib64/msvcr100.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -1027,9 +1027,10 @@ _lfind_s _loaddll _local_unwind -_localtime32 DATA +_localtime32 _localtime32_s _localtime64 +localtime == _localtime64 _localtime64_s _lock _lock_file Modified: trunk/mingw-w64-crt/lib64/msvcr110.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr110.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib64/msvcr110.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -1154,6 +1154,7 @@ _localtime32 _localtime32_s _localtime64 +localtime == _localtime64 _localtime64_s _lock _lock_file Modified: trunk/mingw-w64-crt/lib64/msvcr80.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr80.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib64/msvcr80.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -358,6 +358,7 @@ _loaddll _local_unwind _localtime64 +localtime == _localtime64 _lock _locking _logb @@ -731,8 +732,7 @@ ldexp DATA ldiv localeconv -localtime DATA -;_localtime32 = localtime +_localtime32 log DATA log10 log10f Modified: trunk/mingw-w64-crt/lib64/msvcr90.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr90.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib64/msvcr90.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -645,9 +645,10 @@ _lfind_s _loaddll _local_unwind -_localtime32 DATA +_localtime32 _localtime32_s _localtime64 +localtime == _localtime64 _localtime64_s _lock _lock_file Modified: trunk/mingw-w64-crt/lib64/msvcr90d.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr90d.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib64/msvcr90d.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -704,6 +704,7 @@ _localtime32 _localtime32_s _localtime64 +localtime == _localtime64 _localtime64_s _lock _lock_file Modified: trunk/mingw-w64-crt/lib64/msvcrt.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcrt.def 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/lib64/msvcrt.def 2013-04-04 10:22:16 UTC (rev 5721) @@ -1118,8 +1118,7 @@ ldexp DATA ldiv localeconv -localtime DATA -;_localtime32 = localtime +localtime log DATA log10 log10f DATA Deleted: trunk/mingw-w64-crt/misc/_localtime32.c =================================================================== --- trunk/mingw-w64-crt/misc/_localtime32.c 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/misc/_localtime32.c 2013-04-04 10:22:16 UTC (rev 5721) @@ -1,12 +0,0 @@ -#ifndef __NO_INLINE__ -#define __NO_INLINE__ -#endif -#include <time.h> - -extern struct tm * (__cdecl *__MINGW_IMP_SYMBOL(localtime))(const __time32_t *); - -struct tm *__cdecl _localtime32(const __time32_t *_Time) -{ - return (*__MINGW_IMP_SYMBOL(localtime))(_Time); -} - Deleted: trunk/mingw-w64-crt/misc/localtime.c =================================================================== --- trunk/mingw-w64-crt/misc/localtime.c 2013-04-04 10:21:40 UTC (rev 5720) +++ trunk/mingw-w64-crt/misc/localtime.c 2013-04-04 10:22:16 UTC (rev 5721) @@ -1,20 +0,0 @@ -#define __CRT__NO_INLINE -#include <time.h> - -/* FIXME: Relying on _USE_32BIT_TIME_T, which is a user-macro, -during CRT compilation is plainly broken. Need an appropriate -implementation to provide users the ability of compiling the -CRT only with 32-bit time_t behavior. */ - -#ifndef _USE_32BIT_TIME_T -struct tm *__cdecl localtime(const time_t *_Time) -{ - return _localtime64(_Time); -} -#else -struct tm *__cdecl localtime(const time_t *_Time) -{ - return _localtime32(_Time); -} -#endif - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |