diff options
| author | Yabin Cui <yabinc@google.com> | 2014-11-13 10:02:08 -0800 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2014-11-13 10:11:23 -0800 |
| commit | 8a98535bcb48dfd4bfe3dfddddc82925a2f1502b (patch) | |
| tree | f1acebfd35cff260c400f11dae03f330200f9029 | |
| parent | ca1797ae00d3b5bf2eb4d1cad5bb68cef0074346 (diff) | |
| download | core-8a98535bcb48dfd4bfe3dfddddc82925a2f1502b.tar.gz core-8a98535bcb48dfd4bfe3dfddddc82925a2f1502b.tar.bz2 core-8a98535bcb48dfd4bfe3dfddddc82925a2f1502b.zip | |
kill HAVE_LOCALTIME_R
Bug: 18361583
Change-Id: Icdc745a5204bba26c6438d16ed38ec791e136163
| -rw-r--r-- | liblog/fake_log_device.c | 4 | ||||
| -rw-r--r-- | liblog/log_time.cpp | 4 | ||||
| -rw-r--r-- | liblog/logprint.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c index 136792ddd..b8d87bb02 100644 --- a/liblog/fake_log_device.c +++ b/liblog/fake_log_device.c @@ -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); diff --git a/liblog/log_time.cpp b/liblog/log_time.cpp index 755c2d9bd..209a9da64 100644 --- a/liblog/log_time.cpp +++ b/liblog/log_time.cpp @@ -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); diff --git a/liblog/logprint.c b/liblog/logprint.c index 244f723f0..9b5a543bf 100644 --- a/liblog/logprint.c +++ b/liblog/logprint.c @@ -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)); |