commit 0c3d98b02b74fc64c78e57c07ae6b81eff3a8888
author Ying Wang <wangying@google.com> Thu Aug 14 23:20:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 14 23:20:06 2014 +0000
tree 07be48581fbe164b1d9f28a167292fe0f8493111
parent d5d04be07fd89af8ee6e6fd1d9bd262b9eadc71b
parent 87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a

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

* commit '87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a':
  Fix 64-bit host build.

adb/usb_osx.c

diff --git a/adb/usb_osx.c b/adb/usb_osx.c
index 45ce444..5efb23b 100644
--- a/adb/usb_osx.c
+++ b/adb/usb_osx.c
@@ -197,7 +197,8 @@
         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);

fastboot/usb_osx.c

diff --git a/fastboot/usb_osx.c b/fastboot/usb_osx.c
index 0f55e0d..0b6c515 100644
--- a/fastboot/usb_osx.c
+++ b/fastboot/usb_osx.c
@@ -328,7 +328,8 @@
         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);