summaryrefslogtreecommitdiffstats
path: root/device/bluetooth
diff options
context:
space:
mode:
authoryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 09:32:17 +0000
committeryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-06 09:32:17 +0000
commite62402c9c132b6956f3f312ca87cd751fd762d3e (patch)
tree1a801f1760fb5abb74b5d53ff4d3c7c69c4cfd8d /device/bluetooth
parent224685e2094e88e274006193339db5cec4427566 (diff)
downloadchromium_src-e62402c9c132b6956f3f312ca87cd751fd762d3e.zip
chromium_src-e62402c9c132b6956f3f312ca87cd751fd762d3e.tar.gz
chromium_src-e62402c9c132b6956f3f312ca87cd751fd762d3e.tar.bz2
Build fix for Windows with VS2012 about FACILITY_VISUALCPP macro
<delayimp.h> in VS2012 works fine with Windows 8 SDK regarding to FACILITY_VISUALCPP. TBR=grt@chromium.org NOTRY=true BUG=n/a Review URL: https://codereview.chromium.org/11445042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth')
-rw-r--r--device/bluetooth/bluetooth_adapter_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/device/bluetooth/bluetooth_adapter_win.cc b/device/bluetooth/bluetooth_adapter_win.cc
index 26a9fc5..0df985cb 100644
--- a/device/bluetooth/bluetooth_adapter_win.cc
+++ b/device/bluetooth/bluetooth_adapter_win.cc
@@ -7,7 +7,7 @@
#include "device/bluetooth/bluetooth_adapter_win.h"
#include <BluetoothAPIs.h>
-#if defined(_WIN32_WINNT_WIN8)
+#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700
// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h.
#undef FACILITY_VISUALCPP
#endif