Commit 33fcf86a authored by Ghislain MARY's avatar Ghislain MARY

Use correct macro to detect Android build.

parent 3934c659
......@@ -406,7 +406,7 @@ int bc_tester_run_tests(const char *suite_name, const char *test_name, const cha
}
#if !defined(BC_TESTER_WINDOWS_PHONE) && !defined(BC_TESTER_WINDOWS_UNIVERSAL) && !defined(__QNX__) && !defined(ANDROID) && !defined(IOS)
#if !defined(BC_TESTER_WINDOWS_PHONE) && !defined(BC_TESTER_WINDOWS_UNIVERSAL) && !defined(__QNX__) && !defined(__ANDROID__) && !defined(IOS)
static int file_exists(const char* root_path) {
char * res_path = bc_sprintf("%s/%s", root_path, expected_res);
int err = bctbx_file_exist(res_path);
......@@ -441,7 +441,7 @@ static void detect_res_prefix(const char* prog) {
progname = strdup(ptr + 1);
}
}
#if !defined(BC_TESTER_WINDOWS_PHONE) && !defined(BC_TESTER_WINDOWS_UNIVERSAL) && !defined(__QNX__) && !defined(ANDROID) && !defined(IOS)
#if !defined(BC_TESTER_WINDOWS_PHONE) && !defined(BC_TESTER_WINDOWS_UNIVERSAL) && !defined(__QNX__) && !defined(__ANDROID__) && !defined(IOS)
{
char* prefix = NULL;
char *installed_resources_path = NULL;
......
......@@ -1082,7 +1082,7 @@ static struct addrinfo *convert_to_v4mapped(const struct addrinfo *ai){
return res;
}
#if defined(ANDROID) || defined(_WIN32)
#if defined(__ANDROID__) || defined(_WIN32)
/*
* SHAME !!! bionic's getaddrinfo does not implement the AI_V4MAPPED flag !
......
......@@ -69,7 +69,7 @@ int bctoolbox_tester_set_log_file(const char *filename) {
}
#if !defined(ANDROID) && !(defined(BCTBX_WINDOWS_PHONE) || defined(BCTBX_WINDOWS_UNIVERSAL))
#if !defined(__ANDROID__) && !(defined(BCTBX_WINDOWS_PHONE) || defined(BCTBX_WINDOWS_UNIVERSAL))
static const char* bctoolbox_helper =
"\t\t\t--verbose\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment