StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "kill HAVE_LOCALTIME_R"

Browse Source
This commit is contained in:
Yabin Cui
2014-11-13 20:00:23 +00:00
committed by Gerrit Code Review
parent 044568be18 e9ae59b47f
commit d3d6c3830f
5 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/combo/include/arch/darwin-x86/AndroidConfig.h
View File

@@ -70,11 +70,6 @@
*/ */
#define HAVE_SYMLINKS #define HAVE_SYMLINKS
/*
* Define this if we have localtime_r().
*/
#define HAVE_LOCALTIME_R 1
/* /*
* Endianness of the target machine. Choose one: * Endianness of the target machine. Choose one:
* *

5
core/combo/include/arch/linux-mips/AndroidConfig.h
View File

@@ -70,11 +70,6 @@
*/ */
#define HAVE_SYMLINKS #define HAVE_SYMLINKS
/*
* Define this if we have localtime_r().
*/
/* #define HAVE_LOCALTIME_R */
/* /*
* Define this if we want to use WinSock. * Define this if we want to use WinSock.
*/ */

5
core/combo/include/arch/linux-mips64/AndroidConfig.h
View File

@@ -70,11 +70,6 @@
*/ */
#define HAVE_SYMLINKS #define HAVE_SYMLINKS
/*
* Define this if we have localtime_r().
*/
/* #define HAVE_LOCALTIME_R */
/* /*
* Define this if we want to use WinSock. * Define this if we want to use WinSock.
*/ */

5
core/combo/include/arch/linux-x86/AndroidConfig.h
View File

@@ -65,11 +65,6 @@
*/ */
#define HAVE_SYMLINKS #define HAVE_SYMLINKS
/*
* Define this if we have localtime_r().
*/
#define HAVE_LOCALTIME_R 1
/* /*
* Define this if have clock_gettime() and friends * Define this if have clock_gettime() and friends
*/ */

4
tools/zipalign/ZipEntry.cpp
View File

@@ -356,7 +356,7 @@ time_t ZipEntry::getModWhen(void) const
*/ */
void ZipEntry::setModWhen(time_t when) void ZipEntry::setModWhen(time_t when)
{ {
#ifdef HAVE_LOCALTIME_R #if !defined(_WIN32)
struct tm tmResult; struct tm tmResult;
#endif #endif
time_t even; time_t even;
@@ -368,7 +368,7 @@ void ZipEntry::setModWhen(time_t when)
even = (time_t)(((unsigned long)(when) + 1) & (~1)); even = (time_t)(((unsigned long)(when) + 1) & (~1));
/* expand */ /* expand */
#ifdef HAVE_LOCALTIME_R #if !defined(_WIN32)
ptm = localtime_r(&even, &tmResult); ptm = localtime_r(&even, &tmResult);
#else #else
ptm = localtime(&even); ptm = localtime(&even);