am 75d47421: Merge "Move fastboot\'s Windows code to C++."

* commit '75d47421d0fc1458fad97c32e7fcb6e2d94f3f44': Move fastboot's Windows code to C++.
2015-06-24 19:42:31 +00:00 · 2015-06-24 19:42:31 +00:00 · c078d54adc
commit c078d54adc
parent cb7f5f5111 75d47421d0
3 changed files with 3 additions and 1 deletions
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@ -40,7 +40,7 @@ ifeq ($(HOST_OS),darwin)
 endif

 ifeq ($(HOST_OS),windows)
-  LOCAL_SRC_FILES += usb_windows.c util_windows.c
+  LOCAL_SRC_FILES += usb_windows.cpp util_windows.cpp
  EXTRA_STATIC_LIBS := AdbWinApi
  ifneq ($(strip $(USE_CYGWIN)),)
    # Pure cygwin case
--- a/fastboot/usb_windows.cpp
+++ b/fastboot/usb_windows.cpp
--- a/fastboot/util_windows.cpp
+++ b/fastboot/util_windows.cpp
@ -26,6 +26,8 @@
 * SUCH DAMAGE.
 */

+#include "fastboot.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>