ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix 64-bit host build."

Browse source
This commit is contained in:
Ying Wang 2014-08-14 23:14:18 +00:00 • committed by Gerrit Code Review
commit e1ba39aa66
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)->GetDeviceProduct(dev, &product);
kr = (*dev)->GetLocationID(dev, &locationId); kr = (*dev)->GetLocationID(dev, &locationId);
if (kr == 0) { if (kr == 0) {
snprintf(devpathBuf, sizeof(devpathBuf), "usb:%lX", locationId); snprintf(devpathBuf, sizeof(devpathBuf), "usb:%" PRIu32 "X",
(unsigned int)locationId);
devpath = devpathBuf; devpath = devpathBuf;
} }
kr = (*dev)->USBGetSerialNumberStringIndex(dev, &serialIndex); 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"); ERR("GetLocationId");
goto error; 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); kr = (*dev)->USBGetSerialNumberStringIndex(dev, &serialIndex);