From c636b64e31cefab659f11d05fcdbedf2fb9cf4c1 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 24 Jun 2015 10:48:43 -0700 Subject: [PATCH] Move fastboot's Windows code to C++. Change-Id: I92414594cbdbc1896402c6d950d890042f8df6cf --- fastboot/Android.mk | 2 +- fastboot/{usb_windows.c => usb_windows.cpp} | 0 fastboot/{util_windows.c => util_windows.cpp} | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename fastboot/{usb_windows.c => usb_windows.cpp} (100%) rename fastboot/{util_windows.c => util_windows.cpp} (98%) diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 6443a1fc5..825082da8 100644 --- 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 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 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 74a5c27b4..ec52f3988 100644 --- a/fastboot/util_windows.c +++ b/fastboot/util_windows.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#include "fastboot.h" + #include #include #include