Merge "Fix adb/fastboot windows compilations."

This commit is contained in:
Elliott Hughes 2014-12-10 00:06:31 +00:00 committed by Gerrit Code Review
commit 3e16e2d619
4 changed files with 7 additions and 1 deletions

View file

@ -15,9 +15,12 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#ifdef _WIN32 #ifdef _WIN32
# define WIN32_LEAN_AND_MEAN # ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include "windows.h" # include "windows.h"
# include "shlobj.h" # include "shlobj.h"
#else #else

View file

@ -2,6 +2,7 @@
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <errno.h> #include <errno.h>
#define TRACE_TAG TRACE_SYSDEPS #define TRACE_TAG TRACE_SYSDEPS
#include "adb.h" #include "adb.h"

View file

@ -21,6 +21,7 @@
#include <usb100.h> #include <usb100.h>
#include <adb_api.h> #include <adb_api.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include "sysdeps.h" #include "sysdeps.h"

View file

@ -32,6 +32,7 @@
#include <usb100.h> #include <usb100.h>
#include <adb_api.h> #include <adb_api.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include "usb.h" #include "usb.h"