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

* commit 'd493fa6d797cbdd805f009f7403f2a046190b5d4': kill HAVE_LOCALTIME_R
2014-11-14 00:47:09 +00:00
parent f46501680d d493fa6d79
commit 51b3832756
1 changed files with 2 additions and 2 deletions
--- 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);