summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-02-14 18:23:49 +0100
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-02-14 12:49:14 -0500
commitecfe412f7758c1ab3d3f2a784c7d0356585529e5 (patch)
treecd965d24c54e4ebd8fdfcb893b736398b0c342b6 /sd
parent57d87496d0ac8c35597acc3cf81609eb4aaa55df (diff)
fix build
Caused by 185e1be6cd1954b8cc5a302c879384f2549cd060, fix is more or less d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5. Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/remotecontrol/BluetoothServer.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 991261401216..0a5e1d03d19b 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -34,7 +34,15 @@
#undef WB_LEFT
#undef WB_RIGHT
#include <winsock2.h>
+ // HACK: ws2bth.h defines a struct with a field named MSC, which is
+ // a #define set by gbuild. Plain #undef MSC here fails with MSVC
+ // used together with ccache (bug, presumably), so #define it to some
+ // other usable value.
+ #undef MSC
+ #define MSC mscfield
#include <ws2bth.h>
+ #undef MSC
+ #define MSC
#endif
#ifdef __MINGW32__