| commit | 982a24cdc0aba6a67cff46d473ba9afd5cfeec6f | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Feb 25 18:34:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 18:34:26 2015 +0000 |
| tree | f185c28a1b21b23afd9dd531787bc963fe1adfdf | |
| parent | b757518631fb5b77e17139ccbadc9e9d6c865457 [diff] | |
| parent | 573275954ab7c736f22ad87cc436c3c37c281e87 [diff] |
am d75d6c91: Merge "Fix the mac build." * commit 'd75d6c91d24c071534ed36db85a1e72b33dc5a10': Fix the mac build.
diff --git a/adb/usb_osx.c b/adb/usb_osx.c index ba157f1..aa7e1ea 100644 --- a/adb/usb_osx.c +++ b/adb/usb_osx.c
@@ -22,12 +22,13 @@ #include <IOKit/IOMessage.h> #include <mach/mach_port.h> -#include "sysdeps.h" - #include <stdio.h> +#include "sysdeps.h" + #define TRACE_TAG TRACE_USB #include "adb.h" +#include "transport.h" #define DBG D