commit 743b376b363f85b6109828e5c33857316d263468
author Android (Google) Code Review <android-gerrit@google.com> Tue Jul 28 11:00:39 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 28 11:00:39 2009 -0700
tree 074fedb4ce360f6b6cff0078d308019d51a38164
parent d43d18015e1a9992bfe746016a1f8be2f3bd904f
parent 59fc68ba26dca2543bd96a71254e6b124243fb66

Merge change 8804 into donut

* changes:
  Fix SDK build break caused by including legacy support header into main API header

host/windows/usb/api/adb_api.h

diff --git a/host/windows/usb/api/adb_api.h b/host/windows/usb/api/adb_api.h
index 900ea40..e2ad129 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"

host/windows/usb/api/adb_helper_routines.cpp

diff --git a/host/windows/usb/api/adb_helper_routines.cpp b/host/windows/usb/api/adb_helper_routines.cpp
index 0bc44df..9e37380 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"