diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-10 00:06:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-10 00:06:31 +0000 |
| commit | 3e16e2d6195e112a2bfe2f958e1cfec2bd109a1c (patch) | |
| tree | 15b309b50a8068d2386bd9e5cc1a06e8c84eb5fe | |
| parent | 02ef15f1d7cc6f47b041eb34e7d9d2ef37ff866d (diff) | |
| parent | 67a7a4ae274ebd873a78e791b96da35a210db0cc (diff) | |
| download | system_core-3e16e2d6195e112a2bfe2f958e1cfec2bd109a1c.zip system_core-3e16e2d6195e112a2bfe2f958e1cfec2bd109a1c.tar.gz system_core-3e16e2d6195e112a2bfe2f958e1cfec2bd109a1c.tar.bz2 | |
Merge "Fix adb/fastboot windows compilations."
| -rw-r--r-- | adb/adb_auth_host.c | 5 | ||||
| -rw-r--r-- | adb/sysdeps_win32.c | 1 | ||||
| -rw-r--r-- | adb/usb_windows.c | 1 | ||||
| -rw-r--r-- | fastboot/usb_windows.c | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/adb/adb_auth_host.c b/adb/adb_auth_host.c index 4c33d14..a859199 100644 --- a/adb/adb_auth_host.c +++ b/adb/adb_auth_host.c @@ -15,9 +15,12 @@ */ #include <stdio.h> +#include <stdlib.h> #ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif # include "windows.h" # include "shlobj.h" #else diff --git a/adb/sysdeps_win32.c b/adb/sysdeps_win32.c index b082c6d..e69ec2b 100644 --- a/adb/sysdeps_win32.c +++ b/adb/sysdeps_win32.c @@ -2,6 +2,7 @@ #include <winsock2.h> #include <windows.h> #include <stdio.h> +#include <stdlib.h> #include <errno.h> #define TRACE_TAG TRACE_SYSDEPS #include "adb.h" diff --git a/adb/usb_windows.c b/adb/usb_windows.c index b7ad913..a2d7226 100644 --- a/adb/usb_windows.c +++ b/adb/usb_windows.c @@ -21,6 +21,7 @@ #include <usb100.h> #include <adb_api.h> #include <stdio.h> +#include <stdlib.h> #include "sysdeps.h" diff --git a/fastboot/usb_windows.c b/fastboot/usb_windows.c index 0d13863..a09610f 100644 --- a/fastboot/usb_windows.c +++ b/fastboot/usb_windows.c @@ -32,6 +32,7 @@ #include <usb100.h> #include <adb_api.h> #include <stdio.h> +#include <stdlib.h> #include "usb.h" |