commit 75d086e5b2ed3c7ff70f60ca1f616138b825f551
author Doug Kwan <dougkwan@google.com> Sat Jul 16 19:14:18 2011 -0700
committer Doug Kwan <dougkwan@google.com> Sat Jul 16 19:14:18 2011 -0700
tree 8d74c0cef20d48293a1ecdd840ec525a5334e00e
parent 176ee3d0f24e10e980069158518aa05c0dc466c1

Add C code to use BDADDR_ANY macro properly.  The macro expands into code
that is not valid C++.  So we need to use a C helper.

Change-Id: I5e7a46dd2af404972c1b4b97d21398d77c339cac

core/jni/android_bluetooth_BluetoothAudioGateway.cpp

diff --git a/core/jni/android_bluetooth_BluetoothAudioGateway.cpp b/core/jni/android_bluetooth_BluetoothAudioGateway.cpp
index cb742a3..29c9c2d 100755
--- a/core/jni/android_bluetooth_BluetoothAudioGateway.cpp
+++ b/core/jni/android_bluetooth_BluetoothAudioGateway.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "BluetoothAudioGateway.cpp"
 
 #include "android_bluetooth_common.h"
+#include "android_bluetooth_c.h"
 #include "android_runtime/AndroidRuntime.h"
 #include "JNIHelp.h"
 #include "jni.h"
@@ -491,7 +492,8 @@
     }
 
     laddr.rc_family = AF_BLUETOOTH;
-    memcpy(&laddr.rc_bdaddr, BDADDR_ANY, sizeof(bdaddr_t));
+    bdaddr_t any = android_bluetooth_bdaddr_any();
+    memcpy(&laddr.rc_bdaddr, &any, sizeof(bdaddr_t));
     laddr.rc_channel = channel;
 
     if (bind(sk, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {