system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-20 16:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcrt: Rename _ftime to avoid conflicts.

Browse source
This commit is contained in:
Alexandre Julliard 2008-12-15 20:08:33 +01:00
parent e2b3ee535f
commit 8a658d7d51
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/msvcrt/msvcrt.h
View file

@ -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);

2
dlls/msvcrt/msvcrt.spec
View file

@ -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)

4
dlls/msvcrt/time.c
View file

@ -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;