Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "kill HAVE_LOCALTIME_R"

Browse Source
This commit is contained in:
Yabin Cui
2014-11-13 18:14:12 +00:00
committed by Gerrit Code Review
parent f0044947a7 25d58a9357
commit 537888be7d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/ZipEntry.cpp
View File

@@ -338,7 +338,7 @@ time_t ZipEntry::getModWhen(void) const
*/ */
void ZipEntry::setModWhen(time_t when) void ZipEntry::setModWhen(time_t when)
{ {
#ifdef HAVE_LOCALTIME_R #if !defined(_WIN32)
struct tm tmResult; struct tm tmResult;
#endif #endif
time_t even; time_t even;
@@ -350,7 +350,7 @@ void ZipEntry::setModWhen(time_t when)
even = (time_t)(((unsigned long)(when) + 1) & (~1)); even = (time_t)(((unsigned long)(when) + 1) & (~1));
/* expand */ /* expand */
#ifdef HAVE_LOCALTIME_R #if !defined(_WIN32)
ptm = localtime_r(&even, &tmResult); ptm = localtime_r(&even, &tmResult);
#else #else
ptm = localtime(&even); ptm = localtime(&even);