openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am e1ba39aa: Merge "Fix 64-bit host build." 

* commit 'e1ba39aa6644feb9c5f742f65db6d3363203951f':
  Fix 64-bit host build.
This commit is contained in:
Ying Wang 2014-08-14 23:16:46 +00:00 committed by Android Git Automerger
parent fa41212789 e1ba39aa66
commit 87ad7cdc59
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adb/usb_osx.c
View File

@ -197,7 +197,8 @@ AndroidInterfaceAdded(void *refCon, io_iterator_t iterator)
kr = (*dev)->GetDeviceProduct(dev, &product);
kr = (*dev)->GetLocationID(dev, &locationId);
if (kr == 0) {
snprintf(devpathBuf, sizeof(devpathBuf), "usb:%lX", locationId);
snprintf(devpathBuf, sizeof(devpathBuf), "usb:%" PRIu32 "X",
(unsigned int)locationId);
devpath = devpathBuf;
}
kr = (*dev)->USBGetSerialNumberStringIndex(dev, &serialIndex);

3
fastboot/usb_osx.c
View File

@ -328,7 +328,8 @@ static int try_device(io_service_t device, usb_handle *handle) {
ERR("GetLocationId");
goto error;
}
snprintf(handle->info.device_path, sizeof(handle->info.device_path), "usb:%lX", locationId);
snprintf(handle->info.device_path, sizeof(handle->info.device_path),
"usb:%" PRIu32 "X", (unsigned int)locationId);
kr = (*dev)->USBGetSerialNumberStringIndex(dev, &serialIndex);