summaryrefslogtreecommitdiffstats
path: root/adb/adb_auth_host.c
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-11-06 14:34:24 -0800
committerElliott Hughes <enh@google.com>2014-12-09 16:03:29 -0800
commit67a7a4ae274ebd873a78e791b96da35a210db0cc (patch)
tree15b309b50a8068d2386bd9e5cc1a06e8c84eb5fe /adb/adb_auth_host.c
parent02ef15f1d7cc6f47b041eb34e7d9d2ef37ff866d (diff)
downloadcore-67a7a4ae274ebd873a78e791b96da35a210db0cc.tar.gz
core-67a7a4ae274ebd873a78e791b96da35a210db0cc.tar.bz2
core-67a7a4ae274ebd873a78e791b96da35a210db0cc.zip
Fix adb/fastboot windows compilations.
Many of the windows files where not including stdlib.h even though they are using malloc/free calls. (cherry-pick of ae7bf0959bd3f79afbf365e41f015ed1c304afdc.) Change-Id: If6959df9909d9d9928e9f4a2a96018166361cf3c
Diffstat (limited to 'adb/adb_auth_host.c')
-rw-r--r--adb/adb_auth_host.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/adb_auth_host.c b/adb/adb_auth_host.c
index 4c33d1474..a85919989 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