From 20c147ef1176bb85a8e980956f0f9324c964df9b Mon Sep 17 00:00:00 2001
From: Gabriel Calero <gcalero1984@gmail.com>
Date: Fri, 15 Jun 2018 21:12:38 -0300
Subject: [PATCH] Fix compilation error

---
 interface/src/CrashHandler.h            | 13 -------------
 interface/src/CrashHandler_Breakpad.cpp |  2 +-
 interface/src/CrashHandler_Crashpad.cpp |  2 +-
 interface/src/CrashHandler_None.cpp     |  2 +-
 interface/src/CrashRecoveryHandler.h    |  6 +++---
 interface/src/main.cpp                  |  2 +-
 6 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/interface/src/CrashHandler.h b/interface/src/CrashHandler.h
index 2f51f6f158..4a6483c700 100644
--- a/interface/src/CrashHandler.h
+++ b/interface/src/CrashHandler.h
@@ -14,21 +14,8 @@
 
 #include <string>
 
-#if HAS_CRASHPAD
-
 bool startCrashHandler();
 void setCrashAnnotation(std::string name, std::string value);
 
-#elif HAS_BREAKPAD
-
-bool startCrashHandler();
-void setCrashAnnotation(std::string name, std::string value);
-
-#else
-
-bool startCrashHandler();
-void setCrashAnnotation(std::string name, std::string value);
-
-#endif // hifi_Crashpad_h
 
 #endif
\ No newline at end of file
diff --git a/interface/src/CrashHandler_Breakpad.cpp b/interface/src/CrashHandler_Breakpad.cpp
index 14b5c7c5f2..ffc49c4ec4 100644
--- a/interface/src/CrashHandler_Breakpad.cpp
+++ b/interface/src/CrashHandler_Breakpad.cpp
@@ -1,5 +1,5 @@
 //
-//  Crashpad.cpp
+//  CrashHandler_Breakpad.cpp
 //  interface/src
 //
 //  Created by Clement Brisset on 01/19/18.
diff --git a/interface/src/CrashHandler_Crashpad.cpp b/interface/src/CrashHandler_Crashpad.cpp
index 96c7d5d538..2363e2a643 100644
--- a/interface/src/CrashHandler_Crashpad.cpp
+++ b/interface/src/CrashHandler_Crashpad.cpp
@@ -1,5 +1,5 @@
 //
-//  Crashpad.cpp
+//  CrashHandler_Crashpad.cpp
 //  interface/src
 //
 //  Created by Clement Brisset on 01/19/18.
diff --git a/interface/src/CrashHandler_None.cpp b/interface/src/CrashHandler_None.cpp
index 0d92dc2005..cba585f7b7 100644
--- a/interface/src/CrashHandler_None.cpp
+++ b/interface/src/CrashHandler_None.cpp
@@ -1,5 +1,5 @@
 //
-//  Crashpad.cpp
+//  CrashHandler_None.cpp
 //  interface/src
 //
 //  Created by Clement Brisset on 01/19/18.
diff --git a/interface/src/CrashRecoveryHandler.h b/interface/src/CrashRecoveryHandler.h
index 64aa8ea0e4..8df72eeb75 100644
--- a/interface/src/CrashRecoveryHandler.h
+++ b/interface/src/CrashRecoveryHandler.h
@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_CrashHandler_h
-#define hifi_CrashHandler_h
+#ifndef hifi_CrashRecoveryHandler_h
+#define hifi_CrashRecoveryHandler_h
 
 #include <QString>
 
@@ -30,4 +30,4 @@ private:
     static void handleCrash(Action action);
 };
 
-#endif // hifi_CrashHandler_h
+#endif // hifi_CrashRecoveryHandler_h
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 22db128f7e..e5a436e75a 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -26,7 +26,7 @@
 
 #include "AddressManager.h"
 #include "Application.h"
-#include "Crashpad.h"
+#include "CrashHandler.h"
 #include "InterfaceLogging.h"
 #include "UserActivityLogger.h"
 #include "MainWindow.h"