diff options
| author | Yabin Cui <yabinc@google.com> | 2014-11-13 18:14:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-13 18:14:12 +0000 |
| commit | 537888be7d5cfa6bfa9ddd459a622ea208339735 (patch) | |
| tree | 34ab5c9e87fa304b505bfd60f405b13aad01c869 /tools/aapt | |
| parent | f0044947a7199278d529c9b0b53cde089851ce23 (diff) | |
| parent | 25d58a93571119af35044b54f559e9f88b0b2fff (diff) | |
| download | frameworks_base-537888be7d5cfa6bfa9ddd459a622ea208339735.zip frameworks_base-537888be7d5cfa6bfa9ddd459a622ea208339735.tar.gz frameworks_base-537888be7d5cfa6bfa9ddd459a622ea208339735.tar.bz2 | |
Merge "kill HAVE_LOCALTIME_R"
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/ZipEntry.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/ZipEntry.cpp b/tools/aapt/ZipEntry.cpp index f97f604..54a8e9c 100644 --- a/tools/aapt/ZipEntry.cpp +++ b/tools/aapt/ZipEntry.cpp @@ -338,7 +338,7 @@ time_t ZipEntry::getModWhen(void) const */ void ZipEntry::setModWhen(time_t when) { -#ifdef HAVE_LOCALTIME_R +#if !defined(_WIN32) struct tm tmResult; #endif time_t even; @@ -350,7 +350,7 @@ void ZipEntry::setModWhen(time_t when) even = (time_t)(((unsigned long)(when) + 1) & (~1)); /* expand */ -#ifdef HAVE_LOCALTIME_R +#if !defined(_WIN32) ptm = localtime_r(&even, &tmResult); #else ptm = localtime(&even); |