From 20750ad8239e5314f40177ec961b20e72098638c Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 24 Jun 2015 11:17:28 -0700
Subject: [PATCH] Move fastboot's Mac OS code to C++.

Change-Id: I4f452860a401a115b6e8349237923949f2f476d1
---
 fastboot/Android.mk                   | 2 +-
 fastboot/{usb_osx.c => usb_osx.cpp}   | 0
 fastboot/{util_osx.c => util_osx.cpp} | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename fastboot/{usb_osx.c => usb_osx.cpp} (100%)
 rename fastboot/{util_osx.c => util_osx.cpp} (98%)

diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 6443a1fc5..ee9f5ab23 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -34,7 +34,7 @@ ifeq ($(HOST_OS),linux)
 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
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
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 e71856273..ae0b02460 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>