Module: wine Branch: master Commit: 8a658d7d5155a0fa5678e1528a7cdfe8ce4e0260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a658d7d5155a0fa5678e1528a...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Dec 15 20:08:33 2008 +0100
msvcrt: Rename _ftime to avoid conflicts.
---
dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/time.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1105125..3a894e9 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -695,7 +695,7 @@ MSVCRT_wchar_t*** __cdecl __p__wenviron(void); char* __cdecl _strdate(char* date); char* __cdecl _strtime(char* date); int __cdecl _setmbcp(int); -void __cdecl _ftime(struct MSVCRT__timeb *buf); +void __cdecl MSVCRT__ftime(struct MSVCRT__timeb *buf); int __cdecl MSVCRT__close(int); int __cdecl MSVCRT__dup(int); int __cdecl MSVCRT__dup2(int, int); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d8231f5..c432d61 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -262,7 +262,7 @@ @ cdecl _fstat(long ptr) MSVCRT__fstat @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstati64(long ptr) MSVCRT__fstati64 -@ cdecl _ftime(ptr) +@ cdecl _ftime(ptr) MSVCRT__ftime @ cdecl -ret64 _ftol() ntdll._ftol @ cdecl _fullpath(ptr str long) @ cdecl _futime(long ptr) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 2b4327b..f95b8b6 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -233,7 +233,7 @@ double CDECL MSVCRT_difftime(MSVCRT_time_t time1, MSVCRT_time_t time2) /********************************************************************* * _ftime (MSVCRT.@) */ -void CDECL _ftime(struct MSVCRT__timeb *buf) +void CDECL MSVCRT__ftime(struct MSVCRT__timeb *buf) { TIME_ZONE_INFORMATION tzinfo; FILETIME ft; @@ -260,7 +260,7 @@ MSVCRT_time_t CDECL MSVCRT_time(MSVCRT_time_t* buf) MSVCRT_time_t curtime; struct MSVCRT__timeb tb;
- _ftime(&tb); + MSVCRT__ftime(&tb);
curtime = tb.time; return buf ? *buf = curtime : curtime;