From 29fa7d710857881b6c61cff949d42922b70e8df2 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Mon, 19 May 2014 23:23:35 -0700 Subject: [PATCH] Fix build issue for devices without BLE features. Change-Id: I6499663d253c791cc739ed76b839eb3aefe6613a Conflicts: btif/src/btif_dm.c btif/src/btif_gatt_multi_adv_util.c Conflicts: btif/src/btif_dm.c btif/src/btif_gatt_multi_adv_util.c --- btif/src/btif_dm.c | 2 ++ btif/src/btif_gatt_multi_adv_util.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index 26a736d96..4ef9e2c43 100644 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -1371,8 +1371,10 @@ static void btif_dm_upstreams_evt(UINT16 event, char* p_param) btif_enable_bluetooth_evt(p_data->enable.status, p_data->enable.bd_addr); + #if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE)) /* Enable local privacy */ BTA_DmBleConfigLocalPrivacy(TRUE); + #endif } break; diff --git a/btif/src/btif_gatt_multi_adv_util.c b/btif/src/btif_gatt_multi_adv_util.c index 0f206456a..b352b3ddb 100644 --- a/btif/src/btif_gatt_multi_adv_util.c +++ b/btif/src/btif_gatt_multi_adv_util.c @@ -29,7 +29,7 @@ #include #define LOG_TAG "BtGatt.btif" -#if (BLE_INCLUDED == TRUE) +#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE)) #include "btif_gatt_multi_adv_util.h" #include "btif_common.h" -- 2.11.0