Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1068)

Unified Diff: chrome/app/hard_error_handler_win.cc

Issue 10666046: Better fix for redefined FACILITY_VISUALCPP (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/gamepad/platform_data_fetcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/hard_error_handler_win.cc
===================================================================
--- chrome/app/hard_error_handler_win.cc (revision 144098)
+++ chrome/app/hard_error_handler_win.cc (working copy)
@@ -4,12 +4,11 @@
#include "chrome/app/hard_error_handler_win.h"
-#if _MSC_VER <= 1600
-// The windows SDK now defines in FACILITY_VISUALCPP winerror.h which
-// clashes with the older crt's definition of the same.
+#if defined(_WIN32_WINNT_WIN8)
+// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h.
#undef FACILITY_VISUALCPP
-#include <DelayIMP.h>
#endif
+#include <DelayIMP.h>
#include <ntsecapi.h>
#include <string>
« no previous file with comments | « no previous file | content/browser/gamepad/platform_data_fetcher_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698