Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3d6c383 authored by Yabin Cui's avatar Yabin Cui Committed by Gerrit Code Review
Browse files

Merge "kill HAVE_LOCALTIME_R"

parents 044568be e9ae59b4

core/combo/include/arch/darwin-x86/AndroidConfig.h

+0 −5
Original line number Diff line number Diff line
@@ -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:

 *

core/combo/include/arch/linux-mips/AndroidConfig.h

+0 −5
Original line number Diff line number Diff line
@@ -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.

 */

core/combo/include/arch/linux-mips64/AndroidConfig.h

+0 −5
Original line number Diff line number Diff line
@@ -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.

 */

core/combo/include/arch/linux-x86/AndroidConfig.h

+0 −5
Original line number Diff line number Diff line
@@ -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

 */

tools/zipalign/ZipEntry.cpp

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