From 59fc68ba26dca2543bd96a71254e6b124243fb66 Mon Sep 17 00:00:00 2001 From: vchtchetkine Date: Tue, 28 Jul 2009 10:01:52 -0700 Subject: [PATCH] Fix SDK build break caused by including legacy support header into main API header usb_windows.c doesn't build with adb_legacy_api.h included into adb_api.h Since adb_legacy_api.h is not used anywhere outside AdbWinApi.dll project, the simplest fix would be to remove its inclusion from adb_api.h --- host/windows/usb/api/adb_api.h | 2 -- host/windows/usb/api/adb_helper_routines.cpp | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/host/windows/usb/api/adb_api.h b/host/windows/usb/api/adb_api.h index 900ea40cd..e2ad129ca 100644 --- a/host/windows/usb/api/adb_api.h +++ b/host/windows/usb/api/adb_api.h @@ -22,8 +22,6 @@ as types, structures, and constants definitions used in the API. */ -#include "adb_api_legacy.h" - // Enables compillation for "straight" C #ifdef __cplusplus #define EXTERN_C extern "C" diff --git a/host/windows/usb/api/adb_helper_routines.cpp b/host/windows/usb/api/adb_helper_routines.cpp index 0bc44df4b..9e3738083 100644 --- a/host/windows/usb/api/adb_helper_routines.cpp +++ b/host/windows/usb/api/adb_helper_routines.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "adb_api.h" +#include "adb_api_legacy.h" #include "adb_helper_routines.h" #include "adb_interface_enum.h"