From: <wa...@us...> - 2013-04-04 10:19:42
|
Revision: 5717 http://mingw-w64.svn.sourceforge.net/mingw-w64/?rev=5717&view=rev Author: wavael Date: 2013-04-04 10:19:33 +0000 (Thu, 04 Apr 2013) Log Message: ----------- Provide ctime/_ctime32/_ctime64 for all msvcrt versions through .def files Remove ctime/_ctime32 .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/_ctime32.c trunk/mingw-w64-crt/misc/ctime.c Modified: trunk/mingw-w64-crt/Makefile.am =================================================================== --- trunk/mingw-w64-crt/Makefile.am 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/Makefile.am 2013-04-04 10:19:33 UTC (rev 5717) @@ -175,9 +175,9 @@ 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/_ctime32.c misc/_gmtime32.c misc/_localtime32.c misc/_mkgmtime.c misc/_mkgmtime32.c \ + misc/_gmtime32.c misc/_localtime32.c misc/_mkgmtime.c misc/_mkgmtime32.c \ misc/_mktime32.c misc/_wctime.c misc/_wctime32.c misc/alarm.c \ - misc/basename.c misc/btowc.c misc/ctime.c misc/delay-f.c misc/delay-n.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 \ misc/dirname.c misc/execv.c misc/execve.c misc/execvp.c misc/execvpe.c \ misc/feclearexcept.c misc/fegetenv.c misc/fegetexceptflag.c misc/fegetround.c misc/feholdexcept.c \ Modified: trunk/mingw-w64-crt/lib32/msvcr100.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr100.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib32/msvcr100.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -786,7 +786,8 @@ _cscanf_l _cscanf_s _cscanf_s_l -_ctime32 DATA +_ctime32 +ctime == _ctime32 _ctime32_s _ctime64 _ctime64_s Modified: trunk/mingw-w64-crt/lib32/msvcr110.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr110.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib32/msvcr110.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -911,6 +911,7 @@ _cscanf_s _cscanf_s_l _ctime32 +ctime == _ctime32 _ctime32_s _ctime64 _ctime64_s Modified: trunk/mingw-w64-crt/lib32/msvcr80.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr80.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib32/msvcr80.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -528,8 +528,8 @@ clock cos cosh -ctime DATA -;_ctime32 = ctime +_ctime32 +ctime == _ctime32 difftime div exit Modified: trunk/mingw-w64-crt/lib32/msvcr90.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr90.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib32/msvcr90.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -411,7 +411,8 @@ _cscanf_l _cscanf_s _cscanf_s_l -_ctime32 DATA +_ctime32 +ctime == _ctime32 _ctime32_s _ctime64 _ctime64_s Modified: trunk/mingw-w64-crt/lib32/msvcr90d.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcr90d.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib32/msvcr90d.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -468,6 +468,7 @@ _cscanf_s _cscanf_s_l _ctime32 +ctime == _ctime32 _ctime32_s _ctime64 _ctime64_s Modified: trunk/mingw-w64-crt/lib32/msvcrt.def =================================================================== --- trunk/mingw-w64-crt/lib32/msvcrt.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib32/msvcrt.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -530,8 +530,8 @@ clock cos cosh -ctime DATA -;_ctime32 = ctime +ctime +_ctime32 == ctime difftime div exit Modified: trunk/mingw-w64-crt/lib64/msvcr100.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr100.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib64/msvcr100.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -744,9 +744,10 @@ _cscanf_l _cscanf_s _cscanf_s_l -_ctime32 DATA +_ctime32 _ctime32_s _ctime64 +ctime == _ctime64 _ctime64_s _cwait _cwprintf Modified: trunk/mingw-w64-crt/lib64/msvcr110.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr110.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib64/msvcr110.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -873,6 +873,7 @@ _ctime32 _ctime32_s _ctime64 +ctime == _ctime64 _ctime64_s _cwait _cwprintf Modified: trunk/mingw-w64-crt/lib64/msvcr80.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr80.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib64/msvcr80.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -222,6 +222,7 @@ _creat _cscanf _ctime64 +ctime == _ctime64 _ctype _cwait _cwprintf @@ -654,8 +655,7 @@ cosf cosh coshf -ctime DATA -;_ctime32 = ctime +_ctime32 difftime div exit Modified: trunk/mingw-w64-crt/lib64/msvcr90.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr90.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib64/msvcr90.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -359,9 +359,10 @@ _cscanf_l _cscanf_s _cscanf_s_l -_ctime32 DATA +_ctime32 _ctime32_s _ctime64 +ctime == _ctime64 _ctime64_s _cwait _cwprintf Modified: trunk/mingw-w64-crt/lib64/msvcr90d.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcr90d.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib64/msvcr90d.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -410,6 +410,7 @@ _cscanf_s _cscanf_s_l _ctime32 +ctime == _ctime32 _ctime32_s _ctime64 _ctime64_s Modified: trunk/mingw-w64-crt/lib64/msvcrt.def =================================================================== --- trunk/mingw-w64-crt/lib64/msvcrt.def 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/lib64/msvcrt.def 2013-04-04 10:19:33 UTC (rev 5717) @@ -1038,8 +1038,7 @@ ;cosf cosh ;coshf -ctime DATA -;_ctime32 = ctime +ctime difftime div exit Deleted: trunk/mingw-w64-crt/misc/_ctime32.c =================================================================== --- trunk/mingw-w64-crt/misc/_ctime32.c 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/misc/_ctime32.c 2013-04-04 10:19:33 UTC (rev 5717) @@ -1,12 +0,0 @@ -#ifndef __NO_INLINE__ -#define __NO_INLINE__ -#endif -#include <time.h> - -extern char * (__cdecl * __MINGW_IMP_SYMBOL(ctime))(const __time32_t *); - -char *__cdecl _ctime32(const __time32_t *_Time) -{ - return (*__MINGW_IMP_SYMBOL(ctime))(_Time); -} - Deleted: trunk/mingw-w64-crt/misc/ctime.c =================================================================== --- trunk/mingw-w64-crt/misc/ctime.c 2013-04-03 18:22:28 UTC (rev 5716) +++ trunk/mingw-w64-crt/misc/ctime.c 2013-04-04 10:19:33 UTC (rev 5717) @@ -1,19 +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 -char *__cdecl ctime(const time_t *_Time) -{ - return _ctime64(_Time); -} -#else -char *__cdecl ctime(const time_t *_Time) -{ - return _ctime32(_Time); -} -#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |