| commit | 54b01b8017874a93a9fcc0a18f863b351e3ae596 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 26 01:01:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 01:01:18 2015 +0000 |
| tree | b014f1c38731986048e8bf37c4f9411b29a52be7 | |
| parent | 4a8982e80ef7991d6af6292d59046f9005640d50 [diff] | |
| parent | e780faf098c87d437bc5f6a923a581a6686306e3 [diff] |
am a421c1e5: Merge "Possible Mac build fix." * commit 'a421c1e5bc32ef29bdfa8d065f27b7ea950f12a2': 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;