Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e8ae857 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

am ae7bf095: Fix adb/fastboot windows compilations.

* commit 'ae7bf095':
  Fix adb/fastboot windows compilations.
parents 00ca55dc ae7bf095
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -15,9 +15,12 @@
 */

#include <stdio.h>
#include <stdlib.h>

#ifdef _WIN32
#  ifndef WIN32_LEAN_AND_MEAN
#    define WIN32_LEAN_AND_MEAN
#  endif
#  include "windows.h"
#  include "shlobj.h"
#else
+1 −0
Original line number Diff line number Diff line
@@ -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"
+4 −1
Original line number Diff line number Diff line
@@ -17,9 +17,12 @@
#include "usb_vendors.h"

#include <stdio.h>
#include <stdlib.h>

#ifdef _WIN32
#  ifndef WIN32_LEAN_AND_MEAN
#    define WIN32_LEAN_AND_MEAN
#  endif
#  include "windows.h"
#  include "shlobj.h"
#else
+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@
#include <usb100.h>
#include <adb_api.h>
#include <stdio.h>
#include <stdlib.h>

#include "sysdeps.h"

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@
#include <usb100.h>
#include <adb_api.h>
#include <stdio.h>
#include <stdlib.h>

#include "usb.h"