зеркало из https://github.com/mozilla/gecko-dev.git
Bug 959912 - fix build break on gonk-kk caused by different log header. r=mwu
This commit is contained in:
Родитель
6b4bf8fa52
Коммит
d0d6f968b4
|
@ -25,7 +25,8 @@
|
|||
// supports O_APPEND. These calls have mutex-protected data structures
|
||||
// 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
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -37,8 +38,13 @@
|
|||
#endif
|
||||
#include <stdarg.h>
|
||||
|
||||
#if ANDROID_VERSION >= 19
|
||||
#include <log/uio.h>
|
||||
#include <log/logd.h>
|
||||
#else
|
||||
#include <cutils/uio.h>
|
||||
#include <cutils/logd.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
Загрузка…
Ссылка в новой задаче