commit feddd582e7194e034c291f42528dc3f30d496b53
author Elliott Hughes <enh@google.com> Wed Jun 24 19:29:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 24 19:29:20 2015 +0000
tree 17ade6f41d491672f360c1cbd9b839ea0cd0f7b5
parent 2e8d31f6a16819870c26e428098ccd3f32b2b466
parent 20750ad8239e5314f40177ec961b20e72098638c

Merge "Move fastboot's Mac OS code to C++."

fastboot/Android.mk

diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 6443a1f..ee9f5ab 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -34,7 +34,7 @@
 endif
 
 ifeq ($(HOST_OS),darwin)
-  LOCAL_SRC_FILES += usb_osx.c util_osx.c
+  LOCAL_SRC_FILES += usb_osx.cpp util_osx.cpp
   LOCAL_LDLIBS += -lpthread -framework CoreFoundation -framework IOKit -framework Carbon
   LOCAL_CFLAGS += -Wno-unused-parameter
 endif

fastboot/usb_osx.cpp

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

fastboot/util_osx.cpp

diff --git a/fastboot/util_osx.c b/fastboot/util_osx.cpp
similarity index 98%
rename from fastboot/util_osx.c
rename to fastboot/util_osx.cpp
index e718562..ae0b024 100644
--- a/fastboot/util_osx.c
+++ b/fastboot/util_osx.cpp
@@ -26,6 +26,8 @@
  * SUCH DAMAGE.
  */
 
+#include "fastboot.h"
+
 #import <Carbon/Carbon.h>
 #include <unistd.h>