commit f22a48c931f0000cd40516b7479d9924758c8563
author Elliott Hughes <enh@google.com> Wed Jun 24 20:08:48 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 20:08:48 2015 +0000
tree be562df726f3befa676c62aaf2895a266a024d21
parent 015c3b06928fd4a7cffe141118781c766a7b097f
parent c927ead5a1d63dad09fce6a017107449fc75bec0

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

* commit '7d61df8bf7fee1e108572ac4219f21f11e9f74c0':
  Move fastboot's Windows code to C++.

fastboot/Android.mk

diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index ee9f5ab..ce8e15f 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -40,7 +40,7 @@
 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

fastboot/usb_windows.cpp

diff --git a/fastboot/usb_windows.c b/fastboot/usb_windows.cpp
similarity index 100%
rename from fastboot/usb_windows.c
rename to fastboot/usb_windows.cpp

fastboot/util_windows.cpp

diff --git a/fastboot/util_windows.c b/fastboot/util_windows.cpp
similarity index 98%
rename from fastboot/util_windows.c
rename to fastboot/util_windows.cpp
index 74a5c27..ec52f39 100644
--- a/fastboot/util_windows.c
+++ b/fastboot/util_windows.cpp
@@ -26,6 +26,8 @@
  * SUCH DAMAGE.
  */
 
+#include "fastboot.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>