| commit | abcb46d03018b84ddf2b12f9558974e34075b022 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 04 21:28:26 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 04 21:28:26 2015 +0000 |
| tree | dd793fa0f8f970227c407c48f5e78260317c2f3b | |
| parent | acd6d3a3e5b0376fbf60d1a0e5cfab9866bfec2d [diff] | |
| parent | 06444814c39699beea3e0484ddaea3546882baa3 [diff] |
Merge "Fix Mac adb build." am: 8660035010 am: 2176a87b8e am: 48b6a1f346 * commit '48b6a1f346dd7e01eb7d3cca6fce521156402f46': Fix Mac adb build.
diff --git a/adb/commandline.cpp b/adb/commandline.cpp index 2aa922d..c5eabcf 100644 --- a/adb/commandline.cpp +++ b/adb/commandline.cpp
@@ -41,7 +41,7 @@ #if !defined(_WIN32) #include <signal.h> -#include <termio.h> +#include <sys/ioctl.h> #include <termios.h> #include <unistd.h> #endif