From 813fbf95af77a531c57a8c497345ad2c61d475b3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 18 Jun 2015 14:10:49 +0200 Subject: BASELINE: Update chromium to 44.0.2403.47 Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen --- chromium/device/bluetooth/bluetooth_init_win.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'chromium/device/bluetooth/bluetooth_init_win.h') diff --git a/chromium/device/bluetooth/bluetooth_init_win.h b/chromium/device/bluetooth/bluetooth_init_win.h index 57fe5d79484..b3a505ed779 100644 --- a/chromium/device/bluetooth/bluetooth_init_win.h +++ b/chromium/device/bluetooth/bluetooth_init_win.h @@ -9,14 +9,12 @@ #include #include -#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700 -// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h. -#undef FACILITY_VISUALCPP -#endif #include #include #include +#include "device/bluetooth/bluetooth_export.h" + #pragma comment(lib, "Bthprops.lib") #pragma comment(lib, "BluetoothApis.lib") @@ -26,7 +24,7 @@ namespace bluetooth_init_win { // Returns true if the machine has a bluetooth stack available. The first call // to this function will involve file IO, so it should be done on an appropriate // thread. This function is not thread-safe. -bool HasBluetoothStack(); +bool DEVICE_BLUETOOTH_EXPORT HasBluetoothStack(); } // namespace bluetooth_init_win } // namespace device -- cgit v1.2.1