From 2e44a9ea2518024a07f38c2cc6066ec2074d5210 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 14 Jan 2014 08:41:27 -0800 Subject: [PATCH] liblog: deprecate export LOGGER ioctl definitions Change-Id: I150cad9309255bec2b8bc7230c744e9bbb1b9578 --- include/log/logger.h | 15 --------------- liblog/log_read.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/include/log/logger.h b/include/log/logger.h index 5d217945e..004b690a9 100644 --- a/include/log/logger.h +++ b/include/log/logger.h @@ -163,21 +163,6 @@ struct logger_list *android_logger_list_open(log_id_t id, log_id_t android_name_to_log_id(const char *logName); const char *android_log_id_to_name(log_id_t log_id); -#ifdef HAVE_IOCTL - -#include - -#define __LOGGERIO 0xAE - -#define LOGGER_GET_LOG_BUF_SIZE _IO(__LOGGERIO, 1) /* size of log */ -#define LOGGER_GET_LOG_LEN _IO(__LOGGERIO, 2) /* used log len */ -#define LOGGER_GET_NEXT_ENTRY_LEN _IO(__LOGGERIO, 3) /* next entry len */ -#define LOGGER_FLUSH_LOG _IO(__LOGGERIO, 4) /* flush log */ -#define LOGGER_GET_VERSION _IO(__LOGGERIO, 5) /* abi version */ -#define LOGGER_SET_VERSION _IO(__LOGGERIO, 6) /* abi version */ - -#endif // HAVE_IOCTL - #ifdef __cplusplus } #endif diff --git a/liblog/log_read.c b/liblog/log_read.c index 379105fd9..47aa711d0 100644 --- a/liblog/log_read.c +++ b/liblog/log_read.c @@ -25,6 +25,17 @@ #include #include +#include + +#define __LOGGERIO 0xAE + +#define LOGGER_GET_LOG_BUF_SIZE _IO(__LOGGERIO, 1) /* size of log */ +#define LOGGER_GET_LOG_LEN _IO(__LOGGERIO, 2) /* used log len */ +#define LOGGER_GET_NEXT_ENTRY_LEN _IO(__LOGGERIO, 3) /* next entry len */ +#define LOGGER_FLUSH_LOG _IO(__LOGGERIO, 4) /* flush log */ +#define LOGGER_GET_VERSION _IO(__LOGGERIO, 5) /* abi version */ +#define LOGGER_SET_VERSION _IO(__LOGGERIO, 6) /* abi version */ + typedef char bool; #define false (const bool)0 #define true (const bool)1