commit 76476706abe287666ea24bbf32b7e7790762ec4c
author Adam Lesinski <adamlesinski@google.com> Mon Oct 20 21:35:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 20 21:35:03 2014 +0000
tree d6fd34899f7eec592ca7123caac12e2ba2343352
parent 162f7d797c67019a7a3f08c3b0f0ffc91d548ddc
parent 972dfbc8b43aef5e64d7340f0244f3c601284eba

am 972dfbc8: am a0a7ac03: am fe963bfd: am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PE

* commit '972dfbc8b43aef5e64d7340f0244f3c601284eba':
  MingW doesn't handle __attribute__((weak)) for Windows PE

liblog/logd_write.c

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 @@
 #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 @@
     [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;