Merge "kill HAVE_LOCALTIME_R" (537888be) · Commits · e / os / android_frameworks_base

tools/aapt/ZipEntry.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);