| commit | a421c1e5bc32ef29bdfa8d065f27b7ea950f12a2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 26 00:54:10 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Aug 26 00:54:10 2015 +0000 |
| tree | b014f1c38731986048e8bf37c4f9411b29a52be7 | |
| parent | 626433024df69520b0b45da563b8afce750b25c6 [diff] | |
| parent | 62077d32a245b5a5a687265671219b31f3e4f99c [diff] |
Merge "Possible Mac build fix."
diff --git a/adb/usb_osx.cpp b/adb/usb_osx.cpp index 2ba3ff7..0ce85f3 100644 --- a/adb/usb_osx.cpp +++ b/adb/usb_osx.cpp
@@ -118,7 +118,7 @@ IOUSBDeviceInterface197 **dev = NULL; HRESULT result; SInt32 score; - UInt32 locationId; + uint32_t locationId; UInt8 if_class, subclass, protocol; UInt16 vendor; UInt16 product;