summaryrefslogtreecommitdiffstats
path: root/adb/usb_vendors.c
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-11-06 14:34:24 -0800
committerChristopher Ferris <cferris@google.com>2014-11-06 18:32:39 -0800
commit0eabf64ce0c649e4ef691ae1b70cb20d599dd429 (patch)
tree25bbdbcbfb28af0855bec96baca3573a9b222c1c /adb/usb_vendors.c
parentac12f25004d728fe117c058446fccb0ca0a397c9 (diff)
downloadsystem_core-0eabf64ce0c649e4ef691ae1b70cb20d599dd429.zip
system_core-0eabf64ce0c649e4ef691ae1b70cb20d599dd429.tar.gz
system_core-0eabf64ce0c649e4ef691ae1b70cb20d599dd429.tar.bz2
Fix adb/fastboot windows compilations.
Many of the windows files where not including stdlib.h even though they are using malloc/free calls. Bug: 18283958 (cherry picked from commit ae7bf0959bd3f79afbf365e41f015ed1c304afdc) Change-Id: Iebc09cc314fa8f0ba6c6cd45ba26135052f156dd
Diffstat (limited to 'adb/usb_vendors.c')
-rwxr-xr-xadb/usb_vendors.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 957e5db..19bcae4 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -17,9 +17,12 @@
#include "usb_vendors.h"
#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