| commit | 06444814c39699beea3e0484ddaea3546882baa3 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 04 21:24:38 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 04 21:24:38 2015 +0000 |
| tree | 3f8176d9888ae426b74d3f4df8aa3d6b5724a81c | |
| parent | c9f3043a43f25c5abfebcb77d5e59fcfe65c3b3b [diff] | |
| parent | bcec0980bef16b3c4ba5af306924c0910dfd40b5 [diff] |
Merge "Fix Mac adb build." am: 8660035010 am: 2176a87b8e * commit '2176a87b8e0bb9509bce3b69433fe1c74330ee87': 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