commit 51b38327564c65048385cb05598fd8eb4d730f79
author Yabin Cui <yabinc@google.com> Fri Nov 14 00:47:09 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 14 00:47:09 2014 +0000
tree 224011a528301bb409a9711c7b47fe35cd55c6e3
parent f46501680d9474cbd472347210e05a436437a831
parent d493fa6d797cbdd805f009f7403f2a046190b5d4

am d493fa6d: am 537888be: Merge "kill HAVE_LOCALTIME_R"

* commit 'd493fa6d797cbdd805f009f7403f2a046190b5d4':
  kill HAVE_LOCALTIME_R

tools/aapt/ZipEntry.cpp

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 @@
  */
 void ZipEntry::setModWhen(time_t when)
 {
-#ifdef HAVE_LOCALTIME_R
+#if !defined(_WIN32)
     struct tm tmResult;
 #endif
     time_t even;
@@ -350,7 +350,7 @@
     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);