Skip to content
Snippets Groups Projects
Commit d0d6f968 authored by Kai-Zhen Li's avatar Kai-Zhen Li
Browse files

Bug 959912 - fix build break on gonk-kk caused by different log header. r=mwu

parent 6b4bf8fa
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
// supports O_APPEND. These calls have mutex-protected data structures // supports O_APPEND. These calls have mutex-protected data structures
// and so are NOT reentrant. Do not use LOG in a signal handler. // and so are NOT reentrant. Do not use LOG in a signal handler.
// //
#ifndef _LIBS_CUTILS_LOG_H #if !defined(_LIBS_CUTILS_LOG_H) && !defined(_LIBS_LOG_LOG_H)
#define _LIBS_LOG_LOG_H
#define _LIBS_CUTILS_LOG_H #define _LIBS_CUTILS_LOG_H
#include <stdio.h> #include <stdio.h>
...@@ -37,8 +38,13 @@ ...@@ -37,8 +38,13 @@
#endif #endif
#include <stdarg.h> #include <stdarg.h>
#if ANDROID_VERSION >= 19
#include <log/uio.h>
#include <log/logd.h>
#else
#include <cutils/uio.h> #include <cutils/uio.h>
#include <cutils/logd.h> #include <cutils/logd.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment