5 files changed, 24 insertions, 0 deletions
diff --git a/src/client/windows/handler/exception_handler.h b/src/client/windows/handler/exception_handler.h
index 71360dbc..9f7f14d0 100644
--- a/src/client/windows/handler/exception_handler.h
+++ b/src/client/windows/handler/exception_handler.h
@@ -62,6 +62,10 @@
 #include <Windows.h>
 #include <DbgHelp.h>
 
+#pragma warning( push )
+// Disable exception handler warnings.
+#pragma warning( disable : 4530 ) 
+
 #include <string>
 
 namespace google_airbag {
@@ -143,4 +147,6 @@ class ExceptionHandler {
 
 }  // namespace google_airbag
 
+#pragma warning( pop )
+
 #endif  // CLIENT_WINDOWS_HANDLER_EXCEPTION_HANDLER_H__
diff --git a/src/client/windows/sender/crash_report_sender.cc b/src/client/windows/sender/crash_report_sender.cc
index 2a4f8250..0c48c875 100644
--- a/src/client/windows/sender/crash_report_sender.cc
+++ b/src/client/windows/sender/crash_report_sender.cc
@@ -27,6 +27,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// Disable exception handler warnings.
+#pragma warning( disable : 4530 )
+
 #include "client/windows/sender/crash_report_sender.h"
 #include "common/windows/http_upload.h"
 
diff --git a/src/client/windows/sender/crash_report_sender.h b/src/client/windows/sender/crash_report_sender.h
index 06785818..a909c466 100644
--- a/src/client/windows/sender/crash_report_sender.h
+++ b/src/client/windows/sender/crash_report_sender.h
@@ -38,6 +38,10 @@
 // To use this library in your project, you will need to link against
 // wininet.lib.
 
+#pragma warning( push )
+// Disable exception handler warnings.
+#pragma warning( disable : 4530 ) 
+
 #include <map>
 #include <string>
 
@@ -69,4 +73,6 @@ class CrashReportSender {
 
 }  // namespace google_airbag
 
+#pragma warning( pop )
+
 #endif  // CLIENT_WINDOWS_SENDER_CRASH_REPORT_SENDER_H__
diff --git a/src/common/windows/http_upload.cc b/src/common/windows/http_upload.cc
index 75f8bec5..6176bff8 100644
--- a/src/common/windows/http_upload.cc
+++ b/src/common/windows/http_upload.cc
@@ -31,6 +31,9 @@
 #include <Windows.h>
 #include <WinInet.h>
 
+// Disable exception handler warnings.
+#pragma warning( disable : 4530 ) 
+
 #include <fstream>
 
 #include "common/windows/http_upload.h"
diff --git a/src/common/windows/http_upload.h b/src/common/windows/http_upload.h
index 612e552f..4d86eded 100644
--- a/src/common/windows/http_upload.h
+++ b/src/common/windows/http_upload.h
@@ -34,6 +34,10 @@
 #ifndef COMMON_WINDOWS_HTTP_UPLOAD_H__
 #define COMMON_WINDOWS_HTTP_UPLOAD_H__
 
+#pragma warning( push )
+// Disable exception handler warnings.
+#pragma warning( disable : 4530 ) 
+
 #include <map>
 #include <string>
 #include <vector>
@@ -99,4 +103,6 @@ class HTTPUpload {
 
 }  // namespace google_airbag
 
+#pragma warning( pop )
+
 #endif  // COMMON_WINDOWS_HTTP_UPLOAD_H__