commit d7ea7038239847ad1033012ff4a61b8e2e086f21
author The Android Automerger <android-build@android.com> Thu Jan 12 14:14:18 2012 -0800
committer The Android Automerger <android-build@android.com> Thu Jan 12 14:14:18 2012 -0800
tree 31f673ce2f4b49b340d6ef37e466a6c9a263ed68
parent 6e6506eb74c918e761f9ba08a6c71897334747c1
parent 36eba45fbf3bb51fa0c9c861a2a3b68bf7726bca

merge in ics-release history after reset to master

bluedroid/bluetooth.c

diff --git a/bluedroid/bluetooth.c b/bluedroid/bluetooth.c
index 570cdd9..ee104c9 100644
--- a/bluedroid/bluetooth.c
+++ b/bluedroid/bluetooth.c
@@ -18,6 +18,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -280,7 +281,7 @@
 int str2ba(const char *str, bdaddr_t *ba) {
     int i;
     for (i = 5; i >= 0; i--) {
-        ba->b[i] = (uint8_t) strtoul(str, &str, 16);
+        ba->b[i] = (uint8_t) strtoul(str, (char **) &str, 16);
         str++;
     }
     return 0;