Commit 961caa4a authored by Ghislain MARY's avatar Ghislain MARY

Use correct macro to detect Android build.

parent cfd96347
......@@ -43,7 +43,7 @@
#include "belle-sip/belle-sdp.h"
#include "belle-sip/bodyhandler.h"
#ifdef ANDROID
#ifdef __ANDROID__
#include "belle-sip/wakelock.h"
#endif
......
......@@ -218,7 +218,7 @@ static struct dns_resolv_conf *resconf(belle_sip_simple_resolver_context_t *ctx)
if (error) {
belle_sip_error("%s dns_resconf_loadwin error", __FUNCTION__);
}
#elif defined(ANDROID)
#elif defined(__ANDROID__)
error = dns_resconf_loadandroid(ctx->resconf);
if (error) {
belle_sip_error("%s dns_resconf_loadandroid error", __FUNCTION__);
......
......@@ -89,7 +89,7 @@ static int find_best_clock_id (void) {
#if 0
struct timespec ts;
static int clock_id=-1;
#ifndef ANDROID
#ifndef __ANDROID__
#define DEFAULT_CLOCK_MODE CLOCK_MONOTONIC
#else
#define DEFAULT_CLOCK_MODE CLOCK_REALTIME /*monotonic clock stop during sleep mode*/
......
......@@ -22,7 +22,7 @@
#include <ctype.h>
#include <wchar.h>
#ifdef ANDROID
#ifdef __ANDROID__
#include "wakelock_internal.h"
#endif
......@@ -1537,7 +1537,7 @@ belle_sip_channel_t *belle_sip_channel_find_from_list(belle_sip_list_t *l, int a
return chan;
}
#ifdef ANDROID
#ifdef __ANDROID__
unsigned long belle_sip_begin_background_task(const char *name, belle_sip_background_task_end_callback_t cb, void *data){
return wake_lock_acquire(name);
......
......@@ -112,7 +112,7 @@
#include <resolv.h>
#endif
#ifdef ANDROID
#ifdef __ANDROID__
#include <sys/system_properties.h>
#endif
......@@ -4965,7 +4965,7 @@ int dns_resconf_loadwin(struct dns_resolv_conf *resconf) {
}
#endif /* dns_resconf_loadwin() */
#ifdef ANDROID
#ifdef __ANDROID__
int dns_resconf_loadandroid(struct dns_resolv_conf *resconf) {
char dns[PROP_VALUE_MAX];
char prop_name[PROP_NAME_MAX];
......
......@@ -960,7 +960,7 @@ int dns_resconf_load_struct_res_state_nameservers(struct dns_resolv_conf *rescon
DNS_PUBLIC int dns_resconf_loadwin(struct dns_resolv_conf *);
#endif
#ifdef ANDROID
#ifdef __ANDROID__
DNS_PUBLIC int dns_resconf_loadandroid(struct dns_resolv_conf *resconf);
#endif
......
......@@ -169,7 +169,7 @@ int belle_sip_tester_set_log_file(const char *filename) {
}
#if !defined(ANDROID) && !defined(TARGET_OS_IPHONE) && !(defined(BELLE_SIP_WINDOWS_PHONE) || defined(BELLE_SIP_WINDOWS_UNIVERSAL))
#if !defined(__ANDROID__) && !defined(TARGET_OS_IPHONE) && !(defined(BELLE_SIP_WINDOWS_PHONE) || defined(BELLE_SIP_WINDOWS_UNIVERSAL))
static const char* belle_sip_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