| commit | bcec0980bef16b3c4ba5af306924c0910dfd40b5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 04 21:22:01 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 04 21:22:01 2015 +0000 |
| tree | 24efb39f82711bd566c14e331a918cfb74636495 | |
| parent | 6cd424f54e484d546ebf3c37c32c51b551682be1 [diff] | |
| parent | 3d7dd6c2f8a9bb53497a51488149395362d41a94 [diff] |
Merge "Fix Mac adb build." am: 8660035010 * commit '8660035010515833c538401a418dfb74427aefc6': 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