diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-06 22:41:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 22:41:23 +0000 |
| commit | d01c257f0f19a30178a6d5ec9d6d00d6b702fed3 (patch) | |
| tree | e835399bbf02556226aea7c28bcda396171fcd23 /logd/LogBufferElement.h | |
| parent | e4980725dc14c913978a3bdb30dd1844781bbd27 (diff) | |
| parent | 8f63232712e318da88d2f543fe29066c26d39c32 (diff) | |
| download | system_core-d01c257f0f19a30178a6d5ec9d6d00d6b702fed3.zip system_core-d01c257f0f19a30178a6d5ec9d6d00d6b702fed3.tar.gz system_core-d01c257f0f19a30178a6d5ec9d6d00d6b702fed3.tar.bz2 | |
am 8f632327: am bb0fbdbe: Merge "logd: liblog: 64-bit issues"
* commit '8f63232712e318da88d2f543fe29066c26d39c32':
logd: liblog: 64-bit issues
Diffstat (limited to 'logd/LogBufferElement.h')
| -rw-r--r-- | logd/LogBufferElement.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logd/LogBufferElement.h b/logd/LogBufferElement.h index 390c97c..1da09ae 100644 --- a/logd/LogBufferElement.h +++ b/logd/LogBufferElement.h @@ -32,7 +32,7 @@ class LogBufferElement { const log_time mRealTime; public: - LogBufferElement(log_id_t log_id, struct timespec realtime, + LogBufferElement(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid, const char *msg, unsigned short len); virtual ~LogBufferElement(); @@ -43,8 +43,8 @@ public: log_time getMonotonicTime(void) const { return mMonotonicTime; } log_time getRealTime(void) const { return mRealTime; } - static const struct timespec FLUSH_ERROR; - struct timespec flushTo(SocketClient *writer); + static const log_time FLUSH_ERROR; + log_time flushTo(SocketClient *writer); }; #endif |