Better fix for redefined FACILITY_VISUALCPP

content/browser/gamepad/platform_data_fetcher_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gamepad/platform_data_fetcher_win.h"
 
 #include "base/debug/trace_event.h"
 #include "content/common/gamepad_messages.h"
 #include "content/common/gamepad_hardware_buffer.h"
 
-#if _MSC_VER <= 1600
+#if defined(_WIN32_WINNT_WIN8)
+// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h.
 #undef FACILITY_VISUALCPP
+#endif
 #include <delayimp.h>
-#endif
 
 #pragma comment(lib, "delayimp.lib")
 #pragma comment(lib, "xinput.lib")
 
 namespace content {
 
 using namespace WebKit;
 
 namespace {
 
@@ skipping 146 matching lines @@
       pad.axes[pad.axesLength++] = -NormalizeAxis(state.Gamepad.sThumbLY);
       pad.axes[pad.axesLength++] = NormalizeAxis(state.Gamepad.sThumbRX);
       pad.axes[pad.axesLength++] = -NormalizeAxis(state.Gamepad.sThumbRY);
     } else {
       pad.connected = false;
     }
   }
 }
 
 }  // namespace content