diff options
-rw-r--r-- | core/combo/include/arch/darwin-x86/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/linux-mips/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/linux-mips64/AndroidConfig.h | 5 | ||||
-rw-r--r-- | core/combo/include/arch/linux-x86/AndroidConfig.h | 5 | ||||
-rw-r--r-- | tools/zipalign/ZipEntry.cpp | 4 |
5 files changed, 2 insertions, 22 deletions
diff --git a/core/combo/include/arch/darwin-x86/AndroidConfig.h b/core/combo/include/arch/darwin-x86/AndroidConfig.h index 27769e4..9324c91 100644 --- a/core/combo/include/arch/darwin-x86/AndroidConfig.h +++ b/core/combo/include/arch/darwin-x86/AndroidConfig.h @@ -71,11 +71,6 @@ #define HAVE_SYMLINKS /* - * Define this if we have localtime_r(). - */ -#define HAVE_LOCALTIME_R 1 - -/* * Endianness of the target machine. Choose one: * * HAVE_ENDIAN_H -- have endian.h header we can include. diff --git a/core/combo/include/arch/linux-mips/AndroidConfig.h b/core/combo/include/arch/linux-mips/AndroidConfig.h index adeecfa..9b015b5 100644 --- a/core/combo/include/arch/linux-mips/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips/AndroidConfig.h @@ -71,11 +71,6 @@ #define HAVE_SYMLINKS /* - * Define this if we have localtime_r(). - */ -/* #define HAVE_LOCALTIME_R */ - -/* * Define this if we want to use WinSock. */ /* #define HAVE_WINSOCK */ diff --git a/core/combo/include/arch/linux-mips64/AndroidConfig.h b/core/combo/include/arch/linux-mips64/AndroidConfig.h index f2a81c1..887e2fc 100644 --- a/core/combo/include/arch/linux-mips64/AndroidConfig.h +++ b/core/combo/include/arch/linux-mips64/AndroidConfig.h @@ -71,11 +71,6 @@ #define HAVE_SYMLINKS /* - * Define this if we have localtime_r(). - */ -/* #define HAVE_LOCALTIME_R */ - -/* * Define this if we want to use WinSock. */ /* #define HAVE_WINSOCK */ diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 42bcf79..1733049 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -66,11 +66,6 @@ #define HAVE_SYMLINKS /* - * Define this if we have localtime_r(). - */ -#define HAVE_LOCALTIME_R 1 - -/* * Define this if have clock_gettime() and friends */ #define HAVE_POSIX_CLOCKS diff --git a/tools/zipalign/ZipEntry.cpp b/tools/zipalign/ZipEntry.cpp index d4d366d..b2270cb 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); |