Merge pull request #9130 from alalek:android_define

This commit is contained in:
Alexander Alekhin
2017-07-14 17:17:24 +00:00
25 changed files with 73 additions and 73 deletions
@@ -48,7 +48,7 @@
#define USE_STD_THREADS
#endif
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID) || defined(USE_STD_THREADS)
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || defined(USE_STD_THREADS)
#include "opencv2/core/utility.hpp"
@@ -69,7 +69,7 @@
#define DEBUGLOGS 0
#endif
#ifdef ANDROID
#ifdef __ANDROID__
#include <android/log.h>
#define LOG_TAG "OBJECT_DETECTOR"
#define LOGD0(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))