diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index 27769e4f58..9324c91ff6 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -70,11 +70,6 @@ */ #define HAVE_SYMLINKS -/* - * Define this if we have localtime_r(). - */ -#define HAVE_LOCALTIME_R 1 - /* * Endianness of the target machine. Choose one: * diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h index adeecfa71f..9b015b53c8 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -70,11 +70,6 @@ */ #define HAVE_SYMLINKS -/* - * Define this if we have localtime_r(). - */ -/* #define HAVE_LOCALTIME_R */ - /* * Define this if we want to use WinSock. */ diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index f2a81c18f0..887e2fcc61 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -70,11 +70,6 @@ */ #define HAVE_SYMLINKS -/* - * Define this if we have localtime_r(). - */ -/* #define HAVE_LOCALTIME_R */ - /* * Define this if we want to use WinSock. */ diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 42bcf793a3..173304902e 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -65,11 +65,6 @@ */ #define HAVE_SYMLINKS -/* - * Define this if we have localtime_r(). - */ -#define HAVE_LOCALTIME_R 1 - /* * Define this if have clock_gettime() and friends */ diff --git a/tools/zipalign/ZipEntry.cpp b/tools/zipalign/ZipEntry.cpp index d4d366df09..b2270cb0b7 100644 --- a/tools/zipalign/ZipEntry.cpp +++ b/tools/zipalign/ZipEntry.cpp @@ -356,7 +356,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; @@ -368,7 +368,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);