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

Commit 5a8a0162 authored by Yabin Cui's avatar Yabin Cui Committed by Android Git Automerger
Browse files

am 8f7fc8df: Merge "kill HAVE_LOCALTIME_R" 

* commit '8f7fc8df':
  kill HAVE_LOCALTIME_R
parents d707b7f9 8f7fc8df

liblog/fake_log_device.c

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static ssize_t fake_writev(int fd, const struct iovec *iov, int iovcnt) { 
static void showLog(LogState *state,

        int logPrio, const char* tag, const char* msg)

{

#if defined(HAVE_LOCALTIME_R)

#if !defined(_WIN32)

    struct tm tmBuf;

#endif

    struct tm* ptm;
@@ -377,7 +377,7 @@ static void showLog(LogState *state, 
     * in the time stamp.  Don't use forward slashes, parenthesis,

     * brackets, asterisks, or other special chars here.

     */

#if defined(HAVE_LOCALTIME_R)

#if !defined(_WIN32)

    ptm = localtime_r(&when, &tmBuf);

#else

    ptm = localtime(&when);

liblog/log_time.cpp

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ char *log_time::strptime(const char *s, const char *format) { 
#endif



    struct tm *ptm;

#if (defined(HAVE_LOCALTIME_R))

#if !defined(_WIN32)

    struct tm tmBuf;

    ptm = localtime_r(&now, &tmBuf);

#else
@@ -78,7 +78,7 @@ char *log_time::strptime(const char *s, const char *format) { 
                ++ret;

            }

            now = tv_sec;

#if (defined(HAVE_LOCALTIME_R))

#if !defined(_WIN32)

            ptm = localtime_r(&now, &tmBuf);

#else

            ptm = localtime(&now);

liblog/logprint.c

+2 −2
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ char *android_log_formatLogLine ( 
    const AndroidLogEntry *entry,

    size_t *p_outLength)

{

#if defined(HAVE_LOCALTIME_R)

#if !defined(_WIN32)

    struct tm tmBuf;

#endif

    struct tm* ptm;
@@ -749,7 +749,7 @@ char *android_log_formatLogLine ( 
     * in the time stamp.  Don't use forward slashes, parenthesis,

     * brackets, asterisks, or other special chars here.

     */

#if defined(HAVE_LOCALTIME_R)

#if !defined(_WIN32)

    ptm = localtime_r(&(entry->tv_sec), &tmBuf);

#else

    ptm = localtime(&(entry->tv_sec));