summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-02-14 18:23:49 +0100
committerTor Lillqvist <tml@iki.fi>2013-02-14 18:31:37 +0000
commitb60ccd4d4ddf4076085890938bcc08aca2737e15 (patch)
tree2df7c190a7ee47aa7a0b7ea64108741cc6e7f258
parent4ebcc5b72f49eb3919ca82931572d97347ba2de4 (diff)
fix build
Caused by 185e1be6cd1954b8cc5a302c879384f2549cd060, fix is more or less d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5. Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce Reviewed-on: https://gerrit.libreoffice.org/2154 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
-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 e877cca22756..7fa75ff027f4 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -36,7 +36,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 MACOSX