commit 61f8f6fc1eea6ec08014f9bb4ab7ee7f13cf0b60
author Elliott Hughes <enh@google.com> Wed Jun 24 20:40:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 20:40:47 2015 +0000
tree 54af625be207a6fd1e290abaf8c8edf89eb2559e
parent 9bcd4d754646dd68fb47ac868958d28d295282a1
parent 2ff7a9af7db27bd2e1d534727fdfeb7036b43b4d

am 1a3334f2: Merge "Fix Mac fastboot build."

* commit '1a3334f22965f531449d890c1a97811fa249a754':
  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;