summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-10-20 21:20:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 21:20:40 +0000
commita0a7ac037dd998168fa56d76e9c27bfda1c6a41e (patch)
tree234c185c1bfa547ea561e033577df14e0c552923
parent37ef356a8e4577b289ade868900e15c82c0ad57f (diff)
parentfe963bfd8cf3a240785892f8194debb4e0ebb92d (diff)
downloadsystem_core-a0a7ac037dd998168fa56d76e9c27bfda1c6a41e.zip
system_core-a0a7ac037dd998168fa56d76e9c27bfda1c6a41e.tar.gz
system_core-a0a7ac037dd998168fa56d76e9c27bfda1c6a41e.tar.bz2
am fe963bfd: am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE
* commit 'fe963bfd8cf3a240785892f8194debb4e0ebb92d': MingW doesn't handle __attribute__((weak)) for Windows PE
-rw-r--r--liblog/logd_write.c3
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;