diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-05-24 19:02:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-05-24 19:02:33 +0000 |
| commit | 1292231ff3df5048f7e2e1da1b5b41af1ad076d6 (patch) | |
| tree | 47845f3c4b9f986ff486a45ff105eda963bac23d /src/mir_core | |
| parent | b3efd156b2ded1777ee2b4522acba1fa2d666ca7 (diff) | |
- fixes bug #1250 (Mess with timestamps in JABBER archive (XEP-0136));
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@16870 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/mir_core')
| -rw-r--r-- | src/mir_core/src/timezones.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mir_core/src/timezones.cpp b/src/mir_core/src/timezones.cpp index db648fddaf..322bdbf747 100644 --- a/src/mir_core/src/timezones.cpp +++ b/src/mir_core/src/timezones.cpp @@ -142,8 +142,6 @@ void FormatTime(const SYSTEMTIME *st, const TCHAR *szFormat, TCHAR *szDest, size _tcsncpy_s(szDest, cbDest, tszTemp, _TRUNCATE);
}
-#define fnSystemTimeToTzSpecificLocalTime SystemTimeToTzSpecificLocalTime
-
MIR_CORE_DLL(int) TimeZone_GetTimeZoneTime(HANDLE hTZ, SYSTEMTIME *st)
{
if (st == NULL) return 1;
@@ -154,7 +152,7 @@ MIR_CORE_DLL(int) TimeZone_GetTimeZoneTime(HANDLE hTZ, SYSTEMTIME *st) else if (tz && tz != &myInfo.myTZ) {
SYSTEMTIME sto;
GetSystemTime(&sto);
- return !fnSystemTimeToTzSpecificLocalTime(&tz->tzi, &sto, st);
+ return !SystemTimeToTzSpecificLocalTime(&tz->tzi, &sto, st);
}
else
GetLocalTime(st);
@@ -193,7 +191,7 @@ static void CalcTsOffset(MIM_TIMEZONE *tz) SystemTimeToFileTime(&st, &ft);
mir_time ts1 = FileTimeToUnixTime(&ft);
- if (!fnSystemTimeToTzSpecificLocalTime(&tz->tzi, &st, &stl))
+ if (!SystemTimeToTzSpecificLocalTime(&tz->tzi, &st, &stl))
return;
SystemTimeToFileTime(&stl, &ft);
|