diff options
| author | Yabin Cui <yabinc@google.com> | 2014-11-13 19:05:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-13 19:05:06 +0000 |
| commit | d493fa6d797cbdd805f009f7403f2a046190b5d4 (patch) | |
| tree | 7620aa29b37359e9de50b5d342a13784d80087df /tools/aapt | |
| parent | 3c922dd7f2c82ae09c5ccf5a7b3a338ef682fe65 (diff) | |
| parent | 537888be7d5cfa6bfa9ddd459a622ea208339735 (diff) | |
| download | frameworks_base-d493fa6d797cbdd805f009f7403f2a046190b5d4.zip frameworks_base-d493fa6d797cbdd805f009f7403f2a046190b5d4.tar.gz frameworks_base-d493fa6d797cbdd805f009f7403f2a046190b5d4.tar.bz2 | |
am 537888be: Merge "kill HAVE_LOCALTIME_R"
* commit '537888be7d5cfa6bfa9ddd459a622ea208339735':
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); |