am 537888be: Merge "kill HAVE_LOCALTIME_R"

* commit '537888be7d5cfa6bfa9ddd459a622ea208339735': kill HAVE_LOCALTIME_R
2014-11-13 19:05:06 +00:00
parent 3c922dd7f2 537888be7d
commit d493fa6d79
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);