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

Commit 2ea78713 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge "liblog: use libbase_headers for TEMP_FAILURE_RETRY"

parents 60ddf3a2 121292dd

liblog/event_tag_map.cpp

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <utils/FastStrcmp.h>

#include <utils/RWLock.h>



#include "log_portability.h"

#include "logd_reader.h"



#define OUT_TAG "EventTagMap"

liblog/fake_log_device.cpp

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <log/log_id.h>

#include <log/logprint.h>



#include "log_portability.h"

#include "logger.h"



#define kMaxTagLen 16 /* from the long-dead utils/Log.cpp */

liblog/log_event_list.cpp

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <log/log_event_list.h>

#include <private/android_logger.h>



#include "log_portability.h"



#define MAX_EVENT_PAYLOAD (LOGGER_ENTRY_MAX_PAYLOAD - sizeof(int32_t))



enum ReadWriteFlag {

liblog/log_event_write.cpp

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <log/log.h>

#include <log/log_event_list.h>



#include "log_portability.h"



#define MAX_SUBTAG_LEN 32



int __android_log_error_write(int tag, const char* subTag, int32_t uid, const char* data,

liblog/log_portability.h

+0 −14
Original line number Diff line number Diff line
@@ -31,17 +31,3 @@ 
#define __END_DECLS

#endif

#endif
 


/* possible missing definitions in unistd.h */



#ifndef TEMP_FAILURE_RETRY

/* Used to retry syscalls that can return EINTR. */

#define TEMP_FAILURE_RETRY(exp)            \

  ({                                       \

    __typeof__(exp) _rc;                   \

    do {                                   \

      _rc = (exp);                         \

    } while (_rc == -1 && errno == EINTR); \

    _rc;                                   \

  })

#endif