ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit 'a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2':
  MingW doesn't handle __attribute__((weak)) for Windows PE
This commit is contained in:
Adam Lesinski 2014-10-20 21:14:50 +00:00 • committed by Android Git Automerger
commit fe963bfd8c
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
liblog/logd_write.c
View file

@ -58,7 +58,6 @@ static pthread_mutex_t log_init_lock = PTHREAD_MUTEX_INITIALIZER;
#endif #endif
#if FAKE_LOG_DEVICE #if FAKE_LOG_DEVICE
#define WEAK __attribute__((weak))
static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1, -1 }; static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1, -1 };
#else #else
static int logd_fd = -1; static int logd_fd = -1;
@ -274,7 +273,7 @@ static const char *LOG_NAME[LOG_ID_MAX] = {
[LOG_ID_CRASH] = "crash" [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) { if (log_id >= LOG_ID_MAX) {
log_id = LOG_ID_MAIN; log_id = LOG_ID_MAIN;