commit e4b40fd19b4da8e601232e1ff399a6c0d9cfe9cf
author Elliott Hughes <enh@google.com> Wed Jun 24 20:59:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 20:59:26 2015 +0000
tree 46eea254d79da8840d512c04749503b15d4e0124
parent 4bdff2805f5aa89a874c7d9fb497197a59554f24
parent 90956a2064fc1baa8b5375a7d6d979bcf83909e2

am 90956a20: am 4d2b0716: am 1a3334f2: Merge "Fix Mac fastboot build."

* commit '90956a2064fc1baa8b5375a7d6d979bcf83909e2':
  Fix Mac fastboot build.

fastboot/usb_osx.cpp

diff --git a/fastboot/usb_osx.cpp b/fastboot/usb_osx.cpp
index 0b6c515..a959566 100644
--- a/fastboot/usb_osx.cpp
+++ b/fastboot/usb_osx.cpp
@@ -26,6 +26,7 @@
  * SUCH DAMAGE.
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
@@ -121,7 +122,7 @@
         result = (*plugInInterface)->QueryInterface(
                 plugInInterface,
                 CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID),
-                (LPVOID) &interface);
+                (LPVOID*) &interface);
 
         // No longer need the intermediate plugin
         (*plugInInterface)->Release(plugInInterface);
@@ -279,7 +280,7 @@
 
     // Now create the device interface.
     result = (*plugin)->QueryInterface(plugin,
-            CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID), (LPVOID) &dev);
+            CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID), (LPVOID*) &dev);
     if ((result != 0) || (dev == NULL)) {
         ERR("Couldn't create a device interface (%08x)\n", (int) result);
         goto error;
@@ -432,7 +433,7 @@
         }
 
         if (h.success) {
-            *handle = calloc(1, sizeof(usb_handle));
+            *handle = reinterpret_cast<usb_handle*>(calloc(1, sizeof(usb_handle)));
             memcpy(*handle, &h, sizeof(usb_handle));
             ret = 0;
             break;