From 25d58a93571119af35044b54f559e9f88b0b2fff Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Thu, 13 Nov 2014 09:57:22 -0800 Subject: kill HAVE_LOCALTIME_R Bug: 18361583 Change-Id: Ia79e2b641fd6c61ae5d2b8f2db5456bd3d36a25b --- tools/aapt/ZipEntry.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') 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); -- cgit v1.1