4 files changed, 4 insertions, 10 deletions
diff --git a/src/client/mac/crash_generation/Inspector.h b/src/client/mac/crash_generation/Inspector.h
index 59cb2cdf..9d93b2a7 100644
--- a/src/client/mac/crash_generation/Inspector.h
+++ b/src/client/mac/crash_generation/Inspector.h
@@ -78,7 +78,7 @@ using google_breakpad::MinidumpGenerator;
 
 namespace google_breakpad {
 
-static BOOL EnsureDirectoryPathExists(NSString *dirPath);
+BOOL EnsureDirectoryPathExists(NSString *dirPath);
 
 //=============================================================================
 class ConfigFile {
diff --git a/src/client/mac/crash_generation/Inspector.mm b/src/client/mac/crash_generation/Inspector.mm
index a8930858..1b0b97cb 100644
--- a/src/client/mac/crash_generation/Inspector.mm
+++ b/src/client/mac/crash_generation/Inspector.mm
@@ -57,7 +57,7 @@
 namespace google_breakpad {
 
 //=============================================================================
-static BOOL EnsureDirectoryPathExists(NSString *dirPath) {
+BOOL EnsureDirectoryPathExists(NSString *dirPath) {
   NSFileManager *mgr = [NSFileManager defaultManager];
 
   // If we got a relative path, prepend the current directory
diff --git a/src/client/mac/handler/minidump_generator.cc b/src/client/mac/handler/minidump_generator.cc
index a4ca804c..daf4c03c 100644
--- a/src/client/mac/handler/minidump_generator.cc
+++ b/src/client/mac/handler/minidump_generator.cc
@@ -620,7 +620,7 @@ bool MinidumpGenerator::WriteContextX86(breakpad_thread_state_data_t state,
   AddReg(eflags);
 
   AddReg(eip);
-#undef AddReg(a)
+#undef AddReg
 
   return true;
 }
@@ -666,7 +666,7 @@ bool MinidumpGenerator::WriteContextX86_64(
   AddReg(cs);
   AddReg(fs);
   AddReg(gs);
-#undef AddReg(a)
+#undef AddReg
 
   return true;
 }
diff --git a/src/common/mac/MachIPC.h b/src/common/mac/MachIPC.h
index 2213fc6b..52bed590 100644
--- a/src/common/mac/MachIPC.h
+++ b/src/common/mac/MachIPC.h
@@ -139,12 +139,6 @@ class MachMsgPortDescriptor : public mach_msg_port_descriptor_t {
     return disposition;
   }
 
-  // We're just a simple wrapper for mach_msg_port_descriptor_t
-  // and have the same memory layout
-  operator mach_msg_port_descriptor_t&() {
-    return *this;
-  }
-
   // For convenience
   operator mach_port_t() const {
     return GetMachPort();