Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe963bfd authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

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

* commit 'a1ac84cd':
  MingW doesn't handle __attribute__((weak)) for Windows PE
parents 88b463a1 a1ac84cd

liblog/logd_write.c

+1 −2
Original line number Diff line number Diff line
@@ -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;