diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-20 21:15:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 21:15:53 +0000 |
| commit | b2042f7263c7bbacc5115de4a42c5a96b64a06f2 (patch) | |
| tree | 70d48997c4f4597b1db4192ce753e4ee379e1310 /liblog | |
| parent | cb3739b5453ffaa64daa47bd7db824f58481f9d5 (diff) | |
| parent | a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2 (diff) | |
| download | system_core-b2042f7263c7bbacc5115de4a42c5a96b64a06f2.zip system_core-b2042f7263c7bbacc5115de4a42c5a96b64a06f2.tar.gz system_core-b2042f7263c7bbacc5115de4a42c5a96b64a06f2.tar.bz2 | |
am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE
* commit 'a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2':
MingW doesn't handle __attribute__((weak)) for Windows PE
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/logd_write.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/liblog/logd_write.c b/liblog/logd_write.c index 3659676..b2668ce 100644 --- a/liblog/logd_write.c +++ b/liblog/logd_write.c @@ -58,7 +58,6 @@ static pthread_mutex_t log_init_lock = PTHREAD_MUTEX_INITIALIZER; #endif #if FAKE_LOG_DEVICE -#define WEAK __attribute__((weak)) static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1, -1 }; #else static int logd_fd = -1; @@ -274,7 +273,7 @@ static const char *LOG_NAME[LOG_ID_MAX] = { [LOG_ID_CRASH] = "crash" }; -const WEAK char *android_log_id_to_name(log_id_t log_id) +const char *android_log_id_to_name(log_id_t log_id) { if (log_id >= LOG_ID_MAX) { log_id = LOG_ID_MAIN; |